Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update shared framework to target netcoreapp1.1 #462

Merged
gkhanna79 merged 4 commits into from
Oct 26, 2016
Merged

Update shared framework to target netcoreapp1.1 #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2eb33eb
Update dependencies in pkg/projects/Microsoft.NETCore.App to latest.
dagood Oct 19, 2016
bfdc8aa
Update CoreCLR version in DependencyVersions.cs
dagood Oct 19, 2016
e1fb5ac
Move NETCoreAppVersion into version.props
weshaggard Oct 20, 2016
b9f4ccc
Update shared framework to be netcoreapp1.1 based
weshaggard Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableApp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableTestApp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {},

"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.4",
"portable-net451+win8"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneApp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"emitEntryPoint": true
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": "1.2.0-beta-*",
"Newtonsoft.Json": "9.0.1-beta1"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneTestApp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"emitEntryPoint": true
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.4",
"portable-net451+win8"
Expand Down
7 changes: 3 additions & 4 deletions build_projects/dotnet-host-build/CompileTargets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ public static BuildTargetResult BuildProjectsForNuGetPackages(BuildTargetContext
[Target]
public static BuildTargetResult GenerateMSbuildPropsFile(BuildTargetContext c)
{
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
string platform = c.BuildContext.Get<string>("Platform");

Expand All @@ -326,6 +327,7 @@ public static BuildTargetResult GenerateMSbuildPropsFile(BuildTargetContext c)
msbuildProps.AppendLine($" <BuildNumberMinor>{hostVersion.LatestHostBuildMinor}</BuildNumberMinor>");
msbuildProps.AppendLine($" <PreReleaseLabel>{hostVersion.ReleaseSuffix}</PreReleaseLabel>");
msbuildProps.AppendLine($" <EnsureStableVersion>{hostVersion.EnsureStableVersion}</EnsureStableVersion>");
msbuildProps.AppendLine($" <NetCoreAppVersion>{buildVersion.ProductionVersion}</NetCoreAppVersion>");
msbuildProps.AppendLine(" </PropertyGroup>");
msbuildProps.AppendLine("</Project>");

Expand All @@ -343,11 +345,8 @@ public static BuildTargetResult PackagePkgProjects(BuildTargetContext c)
var pkgDir = Path.Combine(c.BuildContext.BuildDirectory, "pkg");
var packCmd = "pack." + (CurrentPlatform.IsWindows ? "cmd" : "sh");
string rid = HostPackageSupportedRids[c.BuildContext.Get<string>("TargetRID")];
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
File.WriteAllText(Path.Combine(pkgDir, "version.txt"), content);

// Pass the Major.Minor.Patch version to be used when generating packages
Exec(Path.Combine(pkgDir, packCmd), buildVersion.ProductionVersion);
Exec(Path.Combine(pkgDir, packCmd));

foreach (var file in Directory.GetFiles(Path.Combine(pkgDir, "bin", "packages"), "*.nupkg"))
{
Expand Down
14 changes: 7 additions & 7 deletions build_projects/dotnet-host-build/PrepareTargets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class PrepareTargets
// All major targets will depend on this in order to ensure variables are set up right if they are run independently
[Target(
nameof(SetNuGetPackagesDir),
nameof(GenerateVersions),
nameof(CheckPrereqs),
nameof(LocateStage0),
nameof(GenerateVersions),
nameof(CheckPrereqs),
nameof(LocateStage0),
nameof(ExpectedBuildArtifacts),
nameof(RestorePackages),
nameof(PackDotnetDebTool))]
Expand All @@ -52,13 +52,13 @@ public static BuildTargetResult Init(BuildTargetContext c)
targetRID = $"win7-{RuntimeEnvironment.RuntimeArchitecture}";
}
}
string targetFramework = Environment.GetEnvironmentVariable("TARGETFRAMEWORK") ?? "netcoreapp1.0";
string targetFramework = Environment.GetEnvironmentVariable("TARGETFRAMEWORK") ?? "netcoreapp1.1";

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


if (string.IsNullOrEmpty(configEnv))
{
configEnv = "Debug";
}

c.BuildContext["Configuration"] = configEnv;
c.BuildContext["Channel"] = Environment.GetEnvironmentVariable("CHANNEL");
c.BuildContext["Platform"] = platformEnv;
Expand Down Expand Up @@ -114,7 +114,7 @@ public static BuildTargetResult GenerateVersions(BuildTargetContext c)
{
var commitCount = GitUtils.GetCommitCount();

var commitHash = GitUtils.GetCommitHash();
var commitHash = GitUtils.GetCommitHash();

var branchInfo = new BranchInfo(Dirs.RepoRoot);

Expand Down Expand Up @@ -318,7 +318,7 @@ public static BuildTargetResult RestorePackages(BuildTargetContext c)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src"))
.Execute()
.EnsureSuccessful();

return c.Success();
}

Expand Down
6 changes: 3 additions & 3 deletions build_projects/dotnet-host-build/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param(
[string]$Architecture="x64",
[string]$TargetArch="",
[string]$ToolsetDir="",
[string]$Framework="netcoreapp1.0",
[string]$Framework="netcoreapp1.1",
[string[]]$Targets=@("Default"),
[string[]]$EnvVars=@(),
[switch]$NoPackage,
Expand Down Expand Up @@ -54,7 +54,7 @@ if($TargetArch -eq "arm64")
$env:INCLUDE="$ToolsetDir\VC_sdk\inc;$ToolsetDir\sdpublic\sdk\inc;$ToolsetDir\sdpublic\shared\inc;$ToolsetDir\sdpublic\shared\inc\minwin;$ToolsetDir\sdpublic\sdk\inc\ucrt;$ToolsetDir\sdpublic\sdk\inc\minwin;$ToolsetDir\sdpublic\sdk\inc\mincore;$ToolsetDir\sdpublic\sdk\inc\abi;$ToolsetDir\sdpublic\sdk\inc\clientcore;$ToolsetDir\diasdk\include";
}

# No use in specifying a RID if the current and target architecture are equivalent.
# No use in specifying a RID if the current and target architecture are equivalent.
if($TargetArch -eq "x86" -and $Architecture -ne "x86")
{
$env:TARGETRID = "win7-x86";
Expand Down Expand Up @@ -101,7 +101,7 @@ if (!(Test-Path "$RepoRoot\artifacts"))
$DOTNET_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1"
Invoke-WebRequest $DOTNET_INSTALL_SCRIPT_URL -OutFile "$RepoRoot\artifacts\dotnet-install.ps1"

& "$RepoRoot\artifacts\dotnet-install.ps1" -Version 1.0.0-preview3-003223-3 -Architecture $Architecture -Verbose
& "$RepoRoot\artifacts\dotnet-install.ps1" -Version 1.0.0-preview3-003886 -Architecture $Architecture -Verbose
if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }

# Put the stage0 on the path
Expand Down
2 changes: 1 addition & 1 deletion build_projects/dotnet-host-build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ done < "$REPOROOT/branchinfo.txt"
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR

DOTNET_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh"
curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --version 1.0.0-preview3-003223-3 --verbose
curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --version 1.0.0-preview3-003886 --verbose

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


# Put stage 0 on the PATH (for this shell only)
PATH="$DOTNET_INSTALL_DIR:$PATH"
Expand Down
4 changes: 2 additions & 2 deletions build_projects/shared-build-targets-utils/DependencyVersions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class DependencyVersions
{
public static readonly string CoreCLRVersion = "1.2.0-beta-24522-03";
public static readonly string JitVersion = "1.2.0-beta-24522-03";
public static readonly string CoreCLRVersion = "1.2.0-beta-24619-01";
public static readonly string JitVersion = "1.2.0-beta-24619-01";
}
}
2 changes: 1 addition & 1 deletion pkg/pack.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if exist "%__ProjectDir%\bin" (rmdir /s /q "%__ProjectDir%\bin")

:: Package the assets using Tools

"%__DotNet%" "%__MSBuild%" "%__ProjectDir%\projects\packages.builds" /p:TargetsWindows=true /verbosity:minimal /p:NetCoreAppVersion=%1
"%__DotNet%" "%__MSBuild%" "%__ProjectDir%\projects\packages.builds" /p:TargetsWindows=true /verbosity:minimal

if not ERRORLEVEL 0 goto :Error
exit /b 0
Expand Down
2 changes: 1 addition & 1 deletion pkg/pack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else
init_distro_name
fi

__common_parameters="/p:$__targets_param /p:DistroRid=$__distro_rid /p:NetCoreAppVersion=$1 /verbosity:minimal"
__common_parameters="/p:$__targets_param /p:DistroRid=$__distro_rid /verbosity:minimal"

$__msbuild $__project_dir/projects/packages.builds $__common_parameters || exit 1

Expand Down
144 changes: 140 additions & 4 deletions pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<!-- This is passed via pack.[cmd|sh] who get it from CompileTargets.cs -->
<Version>$(NetCoreAppVersion)</Version>
<PackagePlatform>AnyCPU</PackagePlatform>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHostPolicy.pkgproj">
<TargetFramework>.NETCoreApp1.0</TargetFramework>
<TargetFramework>.NETCoreApp1.1</TargetFramework>
</ProjectReference>
</ItemGroup>

Expand All @@ -27,7 +26,7 @@

<Dependency Include="@(PackageMatch -> '%(PackageId)')" Condition="'%(PackageMatch.PackageVersion)' != ''">
<Version>%(PackageMatch.PackageVersion)</Version>
<TargetFramework>.NETCoreApp1.0</TargetFramework>
<TargetFramework>.NETCoreApp1.1</TargetFramework>
</Dependency>

<!-- List of dependencies to mark as exclude=compile -->
Expand All @@ -43,10 +42,147 @@

<File Include="$(PlaceholderFile)" >

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

<SkipPackageFileCheck>true</SkipPackageFileCheck>
<TargetPath>lib/netcoreapp1.0</TargetPath>
<TargetPath>lib/netcoreapp1.1</TargetPath>
</File>
</ItemGroup>
</Target>

<ItemGroup>
<NETCoreApp10Dependency Include="Microsoft.CodeAnalysis.CSharp">
<Version>1.3.0</Version>
<Exclude>Compile</Exclude>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.CodeAnalysis.VisualBasic">
<Version>1.3.0</Version>
<Exclude>Compile</Exclude>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.CSharp">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>1.0.4</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.VisualBasic">
<Version>10.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="NETStandard.Library">
<Version>1.6.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Buffers">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Collections.Immutable">
<Version>1.2.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.ComponentModel">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.ComponentModel.Annotations">
<Version>4.1.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Diagnostics.DiagnosticSource">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Diagnostics.Process">
<Version>4.1.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Dynamic.Runtime">
<Version>4.0.11</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Globalization.Extensions">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.IO.FileSystem.Watcher">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.IO.MemoryMappedFiles">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.IO.UnmanagedMemoryStream">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Linq.Expressions">
<Version>4.1.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Linq.Parallel">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Linq.Queryable">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Net.NameResolution">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Net.Requests">
<Version>4.0.11</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Net.Security">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Net.WebHeaderCollection">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Numerics.Vectors">
<Version>4.1.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Reflection.DispatchProxy">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Reflection.Metadata">
<Version>1.3.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Reflection.TypeExtensions">
<Version>4.1.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Resources.Reader">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Runtime.Loader">
<Version>4.0.0</Version>
<Exclude>Compile</Exclude>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Security.Cryptography.Algorithms">
<Version>4.2.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Security.Cryptography.Encoding">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Security.Cryptography.Primitives">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Security.Cryptography.X509Certificates">
<Version>4.1.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Threading.Tasks.Dataflow">
<Version>4.6.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Threading.Tasks.Extensions">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Threading.Tasks.Parallel">
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Threading.Thread">
<Version>4.0.0</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="System.Threading.ThreadPool">
<Version>4.0.10</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Libuv">
<Version>1.9.0</Version>
</NETCoreApp10Dependency>

<Dependency Include="@(NETCoreApp10Dependency)">
<TargetFramework>.NETCoreApp1.0</TargetFramework>
</Dependency>
<File Include="$(PlaceholderFile)" >
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<TargetPath>lib/netcoreapp1.0</TargetPath>
</File>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
Loading