|
| 1 | +From 5022a1f4c0f490e81710630e775e496ad7cfd112 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Chris Rummel <crummel@microsoft.com> |
| 3 | +Date: Thu, 23 Aug 2018 11:36:10 -0500 |
| 4 | +Subject: [PATCH] Add RuntimeFrameworkVersion to build with source-built |
| 5 | + MS.NETCore.App under 2.1.401. |
| 6 | + |
| 7 | +This version number comes from the version of core-setup that source-build is building |
| 8 | +and will need to be kept synchronized with that version. |
| 9 | + |
| 10 | +--- |
| 11 | + build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 1 + |
| 12 | + src/dotnet/dotnet.csproj | 1 + |
| 13 | + src/redist/redist.csproj | 1 + |
| 14 | + 3 files changed, 3 insertions(+) |
| 15 | + |
| 16 | +diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj |
| 17 | +index acc4382e6..0b7f0d0da 100644 |
| 18 | +--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj |
| 19 | ++++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj |
| 20 | +@@ -3,6 +3,7 @@ |
| 21 | + <Description>Build scripts for dotnet-cli</Description> |
| 22 | + <VersionPrefix>1.0.0</VersionPrefix> |
| 23 | + <TargetFramework>$(CliTargetFramework)</TargetFramework> |
| 24 | ++ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion> |
| 25 | + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
| 26 | + <OutputPath>bin\$(Configuration)</OutputPath> |
| 27 | + <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback> |
| 28 | +diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj |
| 29 | +index 9d8d691a2..e6ef608f4 100644 |
| 30 | +--- a/src/dotnet/dotnet.csproj |
| 31 | ++++ b/src/dotnet/dotnet.csproj |
| 32 | +@@ -2,6 +2,7 @@ |
| 33 | + <PropertyGroup> |
| 34 | + <Version>$(SdkVersion)</Version> |
| 35 | + <TargetFramework>$(CliTargetFramework)</TargetFramework> |
| 36 | ++ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion> |
| 37 | + <AssemblyName>dotnet</AssemblyName> |
| 38 | + <OutputType>Exe</OutputType> |
| 39 | + <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> |
| 40 | +diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj |
| 41 | +index efa5f0ab0..ae3efaa7d 100644 |
| 42 | +--- a/src/redist/redist.csproj |
| 43 | ++++ b/src/redist/redist.csproj |
| 44 | +@@ -5,6 +5,7 @@ |
| 45 | + <PropertyGroup> |
| 46 | + <Version>$(SdkVersion)</Version> |
| 47 | + <TargetFramework>$(CliTargetFramework)</TargetFramework> |
| 48 | ++ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion> |
| 49 | + <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
| 50 | + <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory> |
| 51 | + <AssetTargetFallback>dotnet5.4</AssetTargetFallback> |
| 52 | +-- |
| 53 | +2.18.0 |
| 54 | + |
0 commit comments