From c97484217fbef9ec44dbf2a2cf4042d33855f00e Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 24 Sep 2019 17:21:49 -0700
Subject: [PATCH 1/7] Update branding to 3.0.1 -
aspnet/AspNetCore-Internal#3153
---
Directory.Build.targets | 6 +++++
eng/PatchConfig.props | 55 +----------------------------------------
eng/Versions.props | 9 +++----
3 files changed, 11 insertions(+), 59 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c31b6f65b648..67e287d0c73d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -59,6 +59,12 @@
+
+ true
$(PackagesInPatch.Contains(' $(PackageId);'))
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 2c26521f8cad..b8b76f7355ed 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
When adding a new package, make sure the new line ends with a semicolon and starts with a space.
-Later on, this will be checked using this condition:
+Directory.Build.props checks this property using the following condition:
$(PackagesInPatch.Contains(' $(PackageId);'))
-->
@@ -17,57 +17,4 @@ Later on, this will be checked using this condition:
-
-
- @aspnet/signalr;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
- Microsoft.AspNetCore.Authentication.Google;
- Microsoft.AspNetCore.Http;
- Microsoft.AspNetCore.Mvc.Core;
- Microsoft.AspNetCore.Routing;
- Microsoft.AspNetCore.Server.IIS;
- java:signalr;
-
-
-
-
- @aspnet/signalr;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
-
-
-
-
- Microsoft.AspNetCore.AspNetCoreModule;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
- Microsoft.AspNetCore.Identity.UI;
- java:signalr;
- Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
- Microsoft.AspNetCore.SignalR.Redis;
- Microsoft.AspNetCore.SignalR.StackExchangeRedis;
- Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
- Microsoft.AspNetCore.Mvc.Core;
- Microsoft.AspNetCore.Mvc.RazorPages;
- Microsoft.AspNetCore.AzureAppServicesIntegration;
- Microsoft.AspNetCore.AzureAppServices.HostingStartup;
- Microsoft.AspNetCore.AzureAppServices.SiteExtension;
-
-
-
-
- Microsoft.AspNetCore.Mvc.Api.Analyzers;
- Microsoft.AspNetCore.Server.HttpSys;
- Microsoft.AspNetCore.Server.IIS;
-
-
-
-
- Microsoft.AspNetCore.DataProtection.AzureStorage;
- Microsoft.AspNetCore.Hosting;
- Microsoft.AspNetCore.SpaServices;
-
-
-
-
-
-
diff --git a/eng/Versions.props b/eng/Versions.props
index 023598352fa1..23496f30b25c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,19 +8,18 @@
3
0
- 0
- 2
+ 1
- true
+ false
release
true
false
- rc$(PreReleasePreviewNumber)
- Release Candidate $(PreReleasePreviewNumber)
+ servicing
+ Servicing
9
preview$(BlazorClientPreReleasePreviewNumber)
From fcad3da55816ac4c9c94ad8e5f62196dec518c2f Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 24 Sep 2019 19:28:40 -0700
Subject: [PATCH 2/7] Disable up-to-date check of package baselines
---
eng/targets/Packaging.targets | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index fdef1de7a324..2d738a8cab23 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,7 +1,11 @@
+
From 8bfb2a77bfa68b1df79c7aa191023d3157e01fa1 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 24 Sep 2019 20:04:57 -0700
Subject: [PATCH 3/7] Correct and centralize a couple of conditions - add
`$(IgnorePackageBaselines)` property
---
Directory.Build.targets | 6 +++---
eng/Versions.props | 5 +++++
eng/targets/Packaging.targets | 6 +-----
eng/targets/ResolveReferences.targets | 3 ++-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 67e287d0c73d..89f3cb733ceb 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -60,11 +60,11 @@
true
+ Condition="'$(IsPackageInThisPatch)' == '' AND '$(StabilizePackageVersion)' != 'true'">true
$(PackagesInPatch.Contains(' $(PackageId);'))
diff --git a/eng/Versions.props b/eng/Versions.props
index 23496f30b25c..5aa6860892f7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,6 +26,11 @@
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)
false
+
+ true
true
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 2d738a8cab23..0d31c13ea69c 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,11 +1,7 @@
-
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 263edf3eaa04..1000b4a1ffab 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -45,7 +45,8 @@
* when a project is a test or sample project
We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
-->
- true
+ true
+ true
true
false
From 2d9d13aa38af185612848fe88bd9da8fefd5e73d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 25 Sep 2019 15:12:51 -0700
Subject: [PATCH 4/7] Further centralize choice to opt out of servicing
features for now - no changes in known frameworks, targeting pack features,
et cetera
---
Directory.Build.targets | 9 ++-------
eng/Versions.props | 10 ++++++----
eng/targets/Packaging.targets | 2 +-
eng/targets/ResolveReferences.targets | 4 ++--
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 89f3cb733ceb..0bbb16aa491a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -58,13 +58,8 @@
-
-
- true
+
$(PackagesInPatch.Contains(' $(PackageId);'))
diff --git a/eng/Versions.props b/eng/Versions.props
index 5aa6860892f7..a0c39b7f4e8b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,12 +27,14 @@
false
- true
+ true
- true
+ true
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)
$(VersionPrefix)
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 0d31c13ea69c..fdef1de7a324 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,7 +1,7 @@
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 1000b4a1ffab..3471b276f3a5 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -36,7 +36,8 @@
-->
true
true
- true
+ true
false
- true
true
true
false
From 3c65c03ef80dccc3e3d99061706c59d136b122fb Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 26 Sep 2019 21:56:40 -0700
Subject: [PATCH 5/7] Disable building targeting pack - `$(IsServicingBuild)`
disabled at the moment
---
Directory.Build.props | 2 +-
eng/targets/ResolveReferences.targets | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 66e5b316b19a..3e016ff908d8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -86,7 +86,7 @@
aspnetcore-targeting-pack
- false
+ false
+ <_TarArchiveOutputPath>$(TarArchiveOutputPath)
+ <_TarArchiveOutputPath
+ Condition="Exists('$(repoRoot)\.tools\tar.fromGit')">/$(TarArchiveOutputPath.Replace('\','/').Replace(':',''))
+
+
+
-
+
+
+
+
+
+
From fd34e14f4aa920b57d2136295ef8408d11c84e04 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 30 Sep 2019 19:14:00 -0700
Subject: [PATCH 7/7] Create missing directory and simplify workaround slightly
---
eng/scripts/InstallTar.ps1 | 6 ++----
.../ref/Microsoft.AspNetCore.App.Ref.csproj | 14 +++-----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/eng/scripts/InstallTar.ps1 b/eng/scripts/InstallTar.ps1
index 93f419b213e7..12159a8d0be0 100644
--- a/eng/scripts/InstallTar.ps1
+++ b/eng/scripts/InstallTar.ps1
@@ -25,13 +25,10 @@ $installDir = "$repoRoot\.tools\Git\win-x64"
$tarCommand = "$installDir\usr\bin\tar.exe"
$finalCommand = "$repoRoot\.tools\tar.exe"
-Write-Host "Windows version and other information, because who knows"
+Write-Host "Windows version and other information..."
cmd.exe /c ver
systeminfo.exe
-
Write-Host "Processor Architecture: $env:PROCESSOR_ARCHITECTURE"
-Write-Host "Dumping environment"
-Get-ChildItem env:\
Write-Host "Checking $env:SystemRoot\System32\tar.exe"
Get-ChildItem "$env:SystemRoot\System32\ta*.exe"
@@ -68,6 +65,7 @@ else {
}
}
+New-Item "$repoRoot\.tools\" -ErrorAction SilentlyContinue -ItemType Directory
Copy-Item "$tarCommand" "$finalCommand" -Verbose
Write-Host "Tar now available at '$finalCommand'"
diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
index f1a73df7416e..ff5fa19191ac 100644
--- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
+++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
@@ -170,8 +170,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Outputs="$(ZipArchiveOutputPath);$(TarArchiveOutputPath)"
Condition="'$(IsPackable)' == 'true'">
+ <_TarCommand>tar
<_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe
- <_TarCommand Condition="'$(_TarCommand)' == ''">tar
<_TarArchiveOutputPath>$(TarArchiveOutputPath)
@@ -185,17 +185,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Overwrite="true" />
-
-
+
-
-
+ WorkingDirectory="$(TargetingPackLayoutRoot)" />