Skip to content

Commit a0b585f

Browse files
dagooddagood
committed
Use latest patch version of AspNetCore packages
1 parent d1621d4 commit a0b585f

3 files changed

+75
-0
lines changed

‎patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 9609106bcab766e1e44e464c38cc4148ea639a23 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <[email protected]>
3+
Date: Wed, 13 Jun 2018 09:46:43 -0500
4+
Subject: [PATCH] Persist ASP.NET runtime patch targeting default
5+
6+
Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in the output SDK.
7+
8+
https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
9+
---
10+
build/MSBuildExtensions.targets | 3 +++
11+
1 file changed, 3 insertions(+)
12+
13+
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
14+
index 042cd2e93..7df11b659 100644
15+
--- a/build/MSBuildExtensions.targets
16+
+++ b/build/MSBuildExtensions.targets
17+
@@ -185,6 +185,9 @@ Copyright (c) .NET Foundation. All rights reserved.
18+
<LatestPatchVersionForNetCore1_0 Condition="'$(LatestPatchVersionForNetCore1_0)' == ''">1.0.11</LatestPatchVersionForNetCore1_0>
19+
<LatestPatchVersionForNetCore1_1 Condition="'$(LatestPatchVersionForNetCore1_1)' == ''">1.1.8</LatestPatchVersionForNetCore1_1>
20+
<LatestPatchVersionForNetCore2_0 Condition="'$(LatestPatchVersionForNetCore2_0)' == ''">2.0.7</LatestPatchVersionForNetCore2_0>
21+
+
22+
+ <!-- If true, always target the latest ASP.NET Core runtime by default -->
23+
+ <TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">$(DefaultTargetLatestAspNetCoreRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>
24+
</PropertyGroup>
25+
</Project>
26+
]]>
27+
--
28+
2.17.1.windows.2
29+

‎patches/websdk/0001-Add-versioned-AspNetCore-patch-override-properties.patch

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 2e31a43df045b006135fd9be3e602ebeb65c49a2 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <[email protected]>
3+
Date: Wed, 13 Jun 2018 09:53:41 -0500
4+
Subject: [PATCH] Add versioned AspNetCore patch override properties
5+
6+
https://github.com/aspnet/websdk/issues/355 will include changes that make this patch unnecessary.
7+
---
8+
.../Sdk.DefaultItems.targets | 12 ++++--------
9+
1 file changed, 4 insertions(+), 8 deletions(-)
10+
11+
diff --git a/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets b/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
12+
index 9fc331e..3e6239b 100644
13+
--- a/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
14+
+++ b/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
15+
@@ -67,11 +67,9 @@ Copyright (c) .NET Foundation. All rights reserved.
16+
<!-- Latest patch version of .All Framework -->
17+
<PropertyGroup Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">
18+
<!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
19+
- <!-- <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreAll2_1)</LatestAspNetCoreAllPatchVersion> -->
20+
+ <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreAll2_1)</LatestAspNetCoreAllPatchVersion>
21+
+ <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(LatestPatchVersionForAspNetCoreAll2_2)</LatestAspNetCoreAllPatchVersion>
22+
23+
- <!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
24+
- provided by Microsoft.NETCoreSdk.BundledVersions.props -->
25+
- <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAllTargetFrameworkVersion)'">$(BundledAspNetCoreAllPackageVersion)</LatestAspNetCoreAllPatchVersion>
26+
<!-- If not covered by the previous cases use the target framework version for the latest patch version -->
27+
<LatestAspNetCoreAllPatchVersion Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAllPatchVersion>
28+
</PropertyGroup>
29+
@@ -79,11 +77,9 @@ Copyright (c) .NET Foundation. All rights reserved.
30+
<!-- Latest patch version of .App Framework -->
31+
<PropertyGroup Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">
32+
<!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
33+
- <!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion> -->
34+
+ <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion>
35+
+ <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(LatestPatchVersionForAspNetCoreApp2_2)</LatestAspNetCoreAppPatchVersion>
36+
37+
- <!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
38+
- provided by Microsoft.NETCoreSdk.BundledVersions.props -->
39+
- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAppTargetFrameworkVersion)'">$(BundledAspNetCoreAppPackageVersion)</LatestAspNetCoreAppPatchVersion>
40+
<!-- If not covered by the previous cases use the target framework version for the latest patch version -->
41+
<LatestAspNetCoreAppPatchVersion Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAppPatchVersion>
42+
</PropertyGroup>
43+
--
44+
2.17.1.windows.2
45+

‎repos/cli.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false</BuildCommandArgs>
2424
<BuildCommandArgs>$(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false</BuildCommandArgs>
2525
<BuildCommandArgs>$(BuildCommandArgs) /p:IncludeMSBuildSdkResolver=false</BuildCommandArgs>
26+
<BuildCommandArgs>$(BuildCommandArgs) /p:DefaultTargetLatestAspNetCoreRuntimePatch=true</BuildCommandArgs>
2627

2728
<BuildCommandArgs Condition="'$(OS)' == 'Windows_NT'">$(BuildCommandArgs) '/p:CLITargets=\&quot;\&quot;\&quot;Prepare;Compile;Package\&quot;\&quot;\&quot;'</BuildCommandArgs>
2829
<BuildCommandArgs Condition="'$(OS)' != 'Windows_NT'">$(BuildCommandArgs) '/p:CLITargets=&quot;Prepare;Compile;Package&quot;'</BuildCommandArgs>

0 commit comments

Comments
 (0)