From b9aea1bfb16a1bf8cab71abaf331b9b8f10f238f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 7 Oct 2022 13:17:32 -0700 Subject: [PATCH 001/249] Add dotnet root to the env script as tests we're running correctly in the IDE otherwise --- eng/restore-toolset.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 94cbcbb6e..893a96111 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -29,6 +29,8 @@ set DOTNET_MULTILEVEL_LOOKUP=0 set PATH=$env:DOTNET_INSTALL_DIR;%PATH% set NUGET_PACKAGES=$env:NUGET_PACKAGES + +set DOTNET_ROOT=$env:DOTNET_INSTALL_DIR "@ Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII From 7f3c9e1b954d933c09724ca6d38a33832910d031 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 14:07:02 +0000 Subject: [PATCH 002/249] Update dependencies from https://github.com/dotnet/sdk build 20221104.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22552.16 -> To Version 8.0.0-alpha.1.22554.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6b233c39..bff2c8131 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a65c368e3..818c48bf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime bdd67af67dbf43c0f5e9151b98dc100b9555898a - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da - + https://github.com/dotnet/aspnetcore - fb6b2e25211f9d310aa03edfbda9e38a066960b1 + aeccdb94ee13cc9e88497c04c19317366bf0b9da https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - d609699901b0d25bf939553b342ea887f8d7ef7f + 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 - + https://github.com/dotnet/sdk - d609699901b0d25bf939553b342ea887f8d7ef7f + 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 - + https://github.com/dotnet/sdk - d609699901b0d25bf939553b342ea887f8d7ef7f + 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 - + https://github.com/dotnet/sdk - d609699901b0d25bf939553b342ea887f8d7ef7f + 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 diff --git a/eng/Versions.props b/eng/Versions.props index f5e85481a..df408ae5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 - 8.0.0-alpha.1.22552.16 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22554.2 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22553.26 - 8.0.100-alpha.1.22553.26 + 8.0.100-alpha.1.22554.6 + 8.0.100-alpha.1.22554.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 822c0196491f9cfcb0c3a1ec572fc357800a431a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 21:27:24 +0000 Subject: [PATCH 003/249] Update dependencies from https://github.com/dotnet/sdk build 20221104.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22552.16 -> To Version 8.0.0-alpha.1.22554.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index bff2c8131..6d0b85dae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 818c48bf8..0751ee161 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 + 2ea9341cf0f7c43910072002db4e218396c41f28 - + https://github.com/dotnet/sdk - 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 + 2ea9341cf0f7c43910072002db4e218396c41f28 - + https://github.com/dotnet/sdk - 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 + 2ea9341cf0f7c43910072002db4e218396c41f28 - + https://github.com/dotnet/sdk - 864b46947f5172b9c2fbb5cf94da9eacfebb4bf1 + 2ea9341cf0f7c43910072002db4e218396c41f28 diff --git a/eng/Versions.props b/eng/Versions.props index df408ae5c..4502667ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22554.6 - 8.0.100-alpha.1.22554.6 + 8.0.100-alpha.1.22554.8 + 8.0.100-alpha.1.22554.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69f3510f33d65926a621ebd09723689298c8e421 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Nov 2022 15:36:58 -0700 Subject: [PATCH 004/249] Remove the 7.0.1xx table since that's now in servicing. --- README.md | 110 +++--------------- .../TableGenerator/Program.fs | 5 +- 2 files changed, 16 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index ab1b77259..811a07c0d 100644 --- a/README.md +++ b/README.md @@ -140,21 +140,21 @@ Please do not directly edit the table below. Use https://github.com/dotnet/insta ### Table *Note* the 7.0.100 build will be finished internally. Below is the last public version available from that branch but is not fully updated with the final runtime. -| Platform | main
(8.0.x Runtime) | Release/7.0.2xx
(7.0.x Runtime) | Release/7.0.1xx
(7.0.x Runtime) | -| :--------- | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-7.0.2XX]][win-x64-version-7.0.2XX]
[Installer][win-x64-installer-7.0.2XX] - [Checksum][win-x64-installer-checksum-7.0.2XX]
[zip][win-x64-zip-7.0.2XX] - [Checksum][win-x64-zip-checksum-7.0.2XX] | [![][win-x64-badge-7.0.1XX]][win-x64-version-7.0.1XX]
[Installer][win-x64-installer-7.0.1XX] - [Checksum][win-x64-installer-checksum-7.0.1XX]
[zip][win-x64-zip-7.0.1XX] - [Checksum][win-x64-zip-checksum-7.0.1XX] | -| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-7.0.2XX]][win-x86-version-7.0.2XX]
[Installer][win-x86-installer-7.0.2XX] - [Checksum][win-x86-installer-checksum-7.0.2XX]
[zip][win-x86-zip-7.0.2XX] - [Checksum][win-x86-zip-checksum-7.0.2XX] | [![][win-x86-badge-7.0.1XX]][win-x86-version-7.0.1XX]
[Installer][win-x86-installer-7.0.1XX] - [Checksum][win-x86-installer-checksum-7.0.1XX]
[zip][win-x86-zip-7.0.1XX] - [Checksum][win-x86-zip-checksum-7.0.1XX] | -| **Windows arm** | **N/A** | **N/A** | **N/A** | -| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-7.0.2XX]][win-arm64-version-7.0.2XX]
[Installer][win-arm64-installer-7.0.2XX] - [Checksum][win-arm64-installer-checksum-7.0.2XX]
[zip][win-arm64-zip-7.0.2XX] | [![][win-arm64-badge-7.0.1XX]][win-arm64-version-7.0.1XX]
[Installer][win-arm64-installer-7.0.1XX] - [Checksum][win-arm64-installer-checksum-7.0.1XX]
[zip][win-arm64-zip-7.0.1XX] | -| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-7.0.2XX]][osx-x64-version-7.0.2XX]
[Installer][osx-x64-installer-7.0.2XX] - [Checksum][osx-x64-installer-checksum-7.0.2XX]
[tar.gz][osx-x64-targz-7.0.2XX] - [Checksum][osx-x64-targz-checksum-7.0.2XX] | [![][osx-x64-badge-7.0.1XX]][osx-x64-version-7.0.1XX]
[Installer][osx-x64-installer-7.0.1XX] - [Checksum][osx-x64-installer-checksum-7.0.1XX]
[tar.gz][osx-x64-targz-7.0.1XX] - [Checksum][osx-x64-targz-checksum-7.0.1XX] | -| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-7.0.2XX]][osx-arm64-version-7.0.2XX]
[Installer][osx-arm64-installer-7.0.2XX] - [Checksum][osx-arm64-installer-checksum-7.0.2XX]
[tar.gz][osx-arm64-targz-7.0.2XX] - [Checksum][osx-arm64-targz-checksum-7.0.2XX] | [![][osx-arm64-badge-7.0.1XX]][osx-arm64-version-7.0.1XX]
[Installer][osx-arm64-installer-7.0.1XX] - [Checksum][osx-arm64-installer-checksum-7.0.1XX]
[tar.gz][osx-arm64-targz-7.0.1XX] - [Checksum][osx-arm64-targz-checksum-7.0.1XX] | -| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-7.0.2XX]][linux-version-7.0.2XX]
[DEB Installer][linux-DEB-installer-7.0.2XX] - [Checksum][linux-DEB-installer-checksum-7.0.2XX]
[RPM Installer][linux-RPM-installer-7.0.2XX] - [Checksum][linux-RPM-installer-checksum-7.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.2XX] - [Checksum][linux-targz-checksum-7.0.2XX] | [![][linux-badge-7.0.1XX]][linux-version-7.0.1XX]
[DEB Installer][linux-DEB-installer-7.0.1XX] - [Checksum][linux-DEB-installer-checksum-7.0.1XX]
[RPM Installer][linux-RPM-installer-7.0.1XX] - [Checksum][linux-RPM-installer-checksum-7.0.1XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.1XX] - [Checksum][linux-targz-checksum-7.0.1XX] | -| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-7.0.2XX]][linux-arm-version-7.0.2XX]
[tar.gz][linux-arm-targz-7.0.2XX] - [Checksum][linux-arm-targz-checksum-7.0.2XX] | [![][linux-arm-badge-7.0.1XX]][linux-arm-version-7.0.1XX]
[tar.gz][linux-arm-targz-7.0.1XX] - [Checksum][linux-arm-targz-checksum-7.0.1XX] | -| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-7.0.2XX]][linux-arm64-version-7.0.2XX]
[tar.gz][linux-arm64-targz-7.0.2XX] - [Checksum][linux-arm64-targz-checksum-7.0.2XX] | [![][linux-arm64-badge-7.0.1XX]][linux-arm64-version-7.0.1XX]
[tar.gz][linux-arm64-targz-7.0.1XX] - [Checksum][linux-arm64-targz-checksum-7.0.1XX] | -| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-7.0.2XX]][linux-musl-x64-version-7.0.2XX]
[tar.gz][linux-musl-x64-targz-7.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.2XX] | [![][linux-musl-x64-badge-7.0.1XX]][linux-musl-x64-version-7.0.1XX]
[tar.gz][linux-musl-x64-targz-7.0.1XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.1XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-7.0.2XX]][linux-musl-arm-version-7.0.2XX]
[tar.gz][linux-musl-arm-targz-7.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.2XX] | [![][linux-musl-arm-badge-7.0.1XX]][linux-musl-arm-version-7.0.1XX]
[tar.gz][linux-musl-arm-targz-7.0.1XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.1XX] | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-7.0.2XX]][linux-musl-arm64-version-7.0.2XX]
[tar.gz][linux-musl-arm64-targz-7.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.2XX] | [![][linux-musl-arm64-badge-7.0.1XX]][linux-musl-arm64-version-7.0.1XX]
[tar.gz][linux-musl-arm64-targz-7.0.1XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.1XX] | -| **RHEL 6** | **N/A** | **N/A** | **N/A** | +| Platform | main
(8.0.x Runtime) | Release/7.0.2xx
(7.0.x Runtime) | +| :--------- | :----------: | :----------: | +| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-7.0.2XX]][win-x64-version-7.0.2XX]
[Installer][win-x64-installer-7.0.2XX] - [Checksum][win-x64-installer-checksum-7.0.2XX]
[zip][win-x64-zip-7.0.2XX] - [Checksum][win-x64-zip-checksum-7.0.2XX] | +| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-7.0.2XX]][win-x86-version-7.0.2XX]
[Installer][win-x86-installer-7.0.2XX] - [Checksum][win-x86-installer-checksum-7.0.2XX]
[zip][win-x86-zip-7.0.2XX] - [Checksum][win-x86-zip-checksum-7.0.2XX] | +| **Windows arm** | **N/A** | **N/A** | +| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-7.0.2XX]][win-arm64-version-7.0.2XX]
[Installer][win-arm64-installer-7.0.2XX] - [Checksum][win-arm64-installer-checksum-7.0.2XX]
[zip][win-arm64-zip-7.0.2XX] | +| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-7.0.2XX]][osx-x64-version-7.0.2XX]
[Installer][osx-x64-installer-7.0.2XX] - [Checksum][osx-x64-installer-checksum-7.0.2XX]
[tar.gz][osx-x64-targz-7.0.2XX] - [Checksum][osx-x64-targz-checksum-7.0.2XX] | +| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-7.0.2XX]][osx-arm64-version-7.0.2XX]
[Installer][osx-arm64-installer-7.0.2XX] - [Checksum][osx-arm64-installer-checksum-7.0.2XX]
[tar.gz][osx-arm64-targz-7.0.2XX] - [Checksum][osx-arm64-targz-checksum-7.0.2XX] | +| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-7.0.2XX]][linux-version-7.0.2XX]
[DEB Installer][linux-DEB-installer-7.0.2XX] - [Checksum][linux-DEB-installer-checksum-7.0.2XX]
[RPM Installer][linux-RPM-installer-7.0.2XX] - [Checksum][linux-RPM-installer-checksum-7.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.2XX] - [Checksum][linux-targz-checksum-7.0.2XX] | +| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-7.0.2XX]][linux-arm-version-7.0.2XX]
[tar.gz][linux-arm-targz-7.0.2XX] - [Checksum][linux-arm-targz-checksum-7.0.2XX] | +| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-7.0.2XX]][linux-arm64-version-7.0.2XX]
[tar.gz][linux-arm64-targz-7.0.2XX] - [Checksum][linux-arm64-targz-checksum-7.0.2XX] | +| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-7.0.2XX]][linux-musl-x64-version-7.0.2XX]
[tar.gz][linux-musl-x64-targz-7.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.2XX] | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-7.0.2XX]][linux-musl-arm-version-7.0.2XX]
[tar.gz][linux-musl-arm-targz-7.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.2XX] | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-7.0.2XX]][linux-musl-arm64-version-7.0.2XX]
[tar.gz][linux-musl-arm64-targz-7.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.2XX] | +| **RHEL 6** | **N/A** | **N/A** | Reference notes: > **1**: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing the SDK from the .deb file (via dpkg or similar), then you'll need to install the corresponding dependencies first: @@ -177,13 +177,6 @@ Reference notes: [win-x64-zip-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-x64.zip.sha -[win-x64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/win_x64_Release_version_badge.svg -[win-x64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-win-x64.txt -[win-x64-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.exe -[win-x64-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.exe.sha -[win-x64-zip-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip -[win-x64-zip-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip.sha - [win-x86-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/win_x86_Release_version_badge.svg [win-x86-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-win-x86.txt [win-x86-installer-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x86.exe @@ -198,13 +191,6 @@ Reference notes: [win-x86-zip-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-x86.zip.sha -[win-x86-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/win_x86_Release_version_badge.svg -[win-x86-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-win-x86.txt -[win-x86-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.exe -[win-x86-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.exe.sha -[win-x86-zip-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip -[win-x86-zip-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip.sha - [osx-x64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/osx_x64_Release_version_badge.svg [osx-x64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-osx-x64.txt [osx-x64-installer-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-x64.pkg @@ -219,13 +205,6 @@ Reference notes: [osx-x64-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha -[osx-x64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/osx_x64_Release_version_badge.svg -[osx-x64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-osx-x64.txt -[osx-x64-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.pkg -[osx-x64-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.pkg.sha -[osx-x64-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz -[osx-x64-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha - [osx-arm64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/osx_arm64_Release_version_badge.svg [osx-arm64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-osx-arm64.txt [osx-arm64-installer-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-arm64.pkg @@ -240,13 +219,6 @@ Reference notes: [osx-arm64-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha -[osx-arm64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/osx_arm64_Release_version_badge.svg -[osx-arm64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-osx-arm64.txt -[osx-arm64-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.pkg -[osx-arm64-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.sha -[osx-arm64-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz -[osx-arm64-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha - [linux-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_x64_Release_version_badge.svg [linux-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-x64.txt [linux-DEB-installer-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-x64.deb @@ -265,15 +237,6 @@ Reference notes: [linux-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz.sha -[linux-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_x64_Release_version_badge.svg -[linux-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-x64.txt -[linux-DEB-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-x64.deb -[linux-DEB-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-x64.deb.sha -[linux-RPM-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-x64.rpm -[linux-RPM-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-x64.rpm.sha -[linux-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz -[linux-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha - [linux-arm-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_arm_Release_version_badge.svg [linux-arm-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-arm.txt [linux-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz @@ -284,11 +247,6 @@ Reference notes: [linux-arm-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz.sha -[linux-arm-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_arm_Release_version_badge.svg -[linux-arm-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-arm.txt -[linux-arm-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz -[linux-arm-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha - [linux-arm64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_arm64_Release_version_badge.svg [linux-arm64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-arm64.txt [linux-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz @@ -299,11 +257,6 @@ Reference notes: [linux-arm64-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha -[linux-arm64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_arm64_Release_version_badge.svg -[linux-arm64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-arm64.txt -[linux-arm64-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz -[linux-arm64-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha - [rhel-6-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/rhel.6_x64_Release_version_badge.svg [rhel-6-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-rhel.6-x64.txt [rhel-6-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz @@ -314,11 +267,6 @@ Reference notes: [rhel-6-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha -[rhel-6-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/rhel.6_x64_Release_version_badge.svg -[rhel-6-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-rhel.6-x64.txt -[rhel-6-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz -[rhel-6-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha - [linux-musl-x64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_musl_x64_Release_version_badge.svg [linux-musl-x64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-musl-x64.txt [linux-musl-x64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz @@ -329,11 +277,6 @@ Reference notes: [linux-musl-x64-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha -[linux-musl-x64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_musl_x64_Release_version_badge.svg -[linux-musl-x64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-musl-x64.txt -[linux-musl-x64-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz -[linux-musl-x64-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha - [linux-musl-arm-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_musl_arm_Release_version_badge.svg [linux-musl-arm-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-musl-arm.txt [linux-musl-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz @@ -344,11 +287,6 @@ Reference notes: [linux-musl-arm-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha -[linux-musl-arm-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_musl_arm_Release_version_badge.svg -[linux-musl-arm-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-musl-arm.txt -[linux-musl-arm-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz -[linux-musl-arm-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha - [linux-musl-arm64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/linux_musl_arm64_Release_version_badge.svg [linux-musl-arm64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-linux-musl-arm64.txt [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz @@ -359,11 +297,6 @@ Reference notes: [linux-musl-arm64-targz-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha -[linux-musl-arm64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/linux_musl_arm64_Release_version_badge.svg -[linux-musl-arm64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-linux-musl-arm64.txt -[linux-musl-arm64-targz-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz -[linux-musl-arm64-targz-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha - [win-arm-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/win_arm_Release_version_badge.svg [win-arm-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-win-arm.txt [win-arm-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm.zip @@ -374,11 +307,6 @@ Reference notes: [win-arm-zip-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-arm.zip.sha -[win-arm-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/win_arm_Release_version_badge.svg -[win-arm-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-win-arm.txt -[win-arm-zip-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip -[win-arm-zip-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip.sha - [win-arm64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/win_arm64_Release_version_badge.svg [win-arm64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-win-arm64.txt [win-arm64-installer-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm64.exe @@ -393,16 +321,8 @@ Reference notes: [win-arm64-zip-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-7.0.2XX]: https://aka.ms/dotnet/7.0.2xx/daily/dotnet-sdk-win-arm64.zip.sha -[win-arm64-badge-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/win_arm64_Release_version_badge.svg -[win-arm64-version-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/productCommit-win-arm64.txt -[win-arm64-installer-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.exe -[win-arm64-installer-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.exe.sha -[win-arm64-zip-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip -[win-arm64-zip-checksum-7.0.1XX]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha - [sdk-shas-2.2.1XX]: https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release/2.2#built-repositories - Looking for dotnet-install sources? ----------------------------------- diff --git a/tools/sdk-readme-table-generator/TableGenerator/Program.fs b/tools/sdk-readme-table-generator/TableGenerator/Program.fs index 5398c1f82..c9a721aa2 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Program.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Program.fs @@ -11,10 +11,7 @@ let inputBranches = AkaMsChannel = Some("8.0.1xx/daily") } { GitBranchName = "release/7.0.2xx" DisplayName = "Release/7.0.2xx
(7.0.x Runtime)" - AkaMsChannel = Some("7.0.2xx/daily") } - { GitBranchName = "release/7.0.1xx" - DisplayName = "Release/7.0.1xx
(7.0.x Runtime)" - AkaMsChannel = Some("7.0.1xx/daily") }] + AkaMsChannel = Some("7.0.2xx/daily") }] let referentNotes = """Reference notes: From d2123c940d3b3299fa04b8d9540af3a9ef3237d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Nov 2022 00:13:06 +0000 Subject: [PATCH 005/249] Update dependencies from https://github.com/dotnet/sdk build 20221104.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.16 -> To Version 8.0.0-alpha.1.22554.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d0b85dae..ee707b48c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0751ee161..5977ef544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@
https://github.com/dotnet/sdk - 2ea9341cf0f7c43910072002db4e218396c41f28 + d565c8c75334626f7c12dfe5f4746178b6266bb2 - + https://github.com/dotnet/sdk - 2ea9341cf0f7c43910072002db4e218396c41f28 + d565c8c75334626f7c12dfe5f4746178b6266bb2 - + https://github.com/dotnet/sdk - 2ea9341cf0f7c43910072002db4e218396c41f28 + d565c8c75334626f7c12dfe5f4746178b6266bb2 - + https://github.com/dotnet/sdk - 2ea9341cf0f7c43910072002db4e218396c41f28 + d565c8c75334626f7c12dfe5f4746178b6266bb2 @@ -128,18 +128,18 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - a934894437658f001c6388d33859da73a1ba2ba9 + abd1cc91bc32b1007e7513c6cd55312e9a7835b4 - + https://github.com/dotnet/fsharp - a934894437658f001c6388d33859da73a1ba2ba9 + abd1cc91bc32b1007e7513c6cd55312e9a7835b4 - + https://github.com/microsoft/vstest - eb9fca1710b0430741b279fccdfb24a72151a45b + 02de16cd2915e7b34ffe91ab73432ba4faf4baf8 @@ -158,9 +158,9 @@ 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/nuget/nuget.client - 41c08c5549ac3c738d5bf369014da059eff53fbd + 6038f769411b98f4efdb10a0924986eae2583618 diff --git a/eng/Versions.props b/eng/Versions.props index 4502667ad..06dfd9791 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22554.8 - 8.0.100-alpha.1.22554.8 + 8.0.100-alpha.1.22554.18 + 8.0.100-alpha.1.22554.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221102-03 + 17.5.0-preview-20221103-01 7.0.0-rc.1.22426.10 From 6a021f0c6e5ba0c16573625ee4f98cc85944c43a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Nov 2022 12:22:46 +0000 Subject: [PATCH 006/249] Update dependencies from https://github.com/dotnet/arcade build 20221104.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22552.1 -> To Version 8.0.0-beta.22554.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab801caa7..fa442a920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5be556106f26f171f32187951b9a141f9580d03a + 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade - 5be556106f26f171f32187951b9a141f9580d03a + 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade - 5be556106f26f171f32187951b9a141f9580d03a + 80b6be47e1425ea90c5febffac119250043a0c92 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5df8c8b93..57fb64d11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22552.1 + 8.0.0-beta.22554.2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06..39be08d4b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aba6308ad..449126943 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 76d7a24cb..fda4cecfe 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22552.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22552.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22554.2" } } From d71044410cf5187fe14cb937c98cc90d841b1ca6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Nov 2022 12:32:02 +0000 Subject: [PATCH 007/249] Update dependencies from https://github.com/dotnet/emsdk build 20221104.1 Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 8.0.0-alpha.1.22552.9 -> To Version 8.0.0-alpha.1.22554.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab801caa7..2450cc2f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 43618b75f5db5c38a8649c4511fd5e768b200ad7 + b6656f5b78cd25f984355f973e65da3d844ac6d1 - + https://github.com/dotnet/emsdk - 43618b75f5db5c38a8649c4511fd5e768b200ad7 + b6656f5b78cd25f984355f973e65da3d844ac6d1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 5df8c8b93..ae2f23275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,8 +221,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22552.9 - 8.0.0-alpha.1.22552.9 + 8.0.0-alpha.1.22554.1 + 8.0.0-alpha.1.22554.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From 4e7e1a1c82b4d4fb9ecfaa2adf53d04d766d3f39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 6 Nov 2022 14:35:18 +0000 Subject: [PATCH 008/249] Update dependencies from https://github.com/dotnet/sdk build 20221106.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.16 -> To Version 8.0.0-alpha.1.22554.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee707b48c..eb3783123 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5977ef544..0e0a437a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - d565c8c75334626f7c12dfe5f4746178b6266bb2 + 4a27d47440dd3eaefbdb31135ef8867f6758161f - + https://github.com/dotnet/sdk - d565c8c75334626f7c12dfe5f4746178b6266bb2 + 4a27d47440dd3eaefbdb31135ef8867f6758161f - + https://github.com/dotnet/sdk - d565c8c75334626f7c12dfe5f4746178b6266bb2 + 4a27d47440dd3eaefbdb31135ef8867f6758161f - + https://github.com/dotnet/sdk - d565c8c75334626f7c12dfe5f4746178b6266bb2 + 4a27d47440dd3eaefbdb31135ef8867f6758161f @@ -153,9 +153,9 @@ c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 - + https://github.com/dotnet/msbuild - 3777dcaf7edb3e86a070037ba53e742dd1872873 + 3bcada934edfa09e5f68222411e3efeda407985c diff --git a/eng/Versions.props b/eng/Versions.props index 06dfd9791..1428906bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22554.18 - 8.0.100-alpha.1.22554.18 + 8.0.100-alpha.1.22556.2 + 8.0.100-alpha.1.22556.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 146ae9aea050831cdabaa59cb002619f67e81420 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 03:15:27 +0000 Subject: [PATCH 009/249] Update dependencies from https://github.com/dotnet/sdk build 20221106.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb3783123..889fdc9ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6313bbd4a..ada8ffc2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 4a27d47440dd3eaefbdb31135ef8867f6758161f + 26225a22013419a9d10fa6fe11fb61beeaf5006f - + https://github.com/dotnet/sdk - 4a27d47440dd3eaefbdb31135ef8867f6758161f + 26225a22013419a9d10fa6fe11fb61beeaf5006f - + https://github.com/dotnet/sdk - 4a27d47440dd3eaefbdb31135ef8867f6758161f + 26225a22013419a9d10fa6fe11fb61beeaf5006f - + https://github.com/dotnet/sdk - 4a27d47440dd3eaefbdb31135ef8867f6758161f + 26225a22013419a9d10fa6fe11fb61beeaf5006f diff --git a/eng/Versions.props b/eng/Versions.props index 6f9a79b9e..97fa95677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22556.2 - 8.0.100-alpha.1.22556.2 + 8.0.100-alpha.1.22556.3 + 8.0.100-alpha.1.22556.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c63c57f911c39893b1d4929702fc8c9ba3e5aafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 7 Nov 2022 11:00:08 +0100 Subject: [PATCH 010/249] Bump DarcLib to fix zero-sized patches in VMR sync (#14907) --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0fc31e809..6e0b834c7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22554.2", + "version": "1.1.0-beta.22554.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ada8ffc2b..026ced089 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - 7a093e86507405b990f0e6aa5c634c9a5585319f + aa6e835ea5e8ef70a95a8fa6075fdf4c73de8bd8 - + https://github.com/dotnet/arcade-services - 7a093e86507405b990f0e6aa5c634c9a5585319f + aa6e835ea5e8ef70a95a8fa6075fdf4c73de8bd8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 97fa95677..3363dcd0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22554.2 + 1.1.0-beta.22554.5 From 23008a7e12344b6adbb36b9c78e2634ad7779e88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 16:58:26 +0000 Subject: [PATCH 011/249] Update dependencies from https://github.com/dotnet/test-templates build 20221107.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 026ced089..ea5e011b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3363dcd0b..622433854 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,10 +43,10 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 From 1f9ad90871096a759c4fe2582f9477e1fa86fd1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 16:58:27 +0000 Subject: [PATCH 012/249] Update dependencies from https://github.com/dotnet/test-templates build 20221107.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dec66aaef..b79af56ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 diff --git a/eng/Versions.props b/eng/Versions.props index 156ac9455..84ac7196d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 From 1b6a3b7d707dd6f1cbc6e0f1b87e89fad9e2cae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 18:25:20 +0000 Subject: [PATCH 013/249] Update dependencies from https://github.com/dotnet/test-templates build 20221107.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea5e011b2..dea6431f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 622433854..63895a166 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,10 +43,10 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 From a447f8993dbc8912c7e45864eccb0eb3064bccca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 19:46:16 +0000 Subject: [PATCH 014/249] Update dependencies from https://github.com/dotnet/test-templates build 20221107.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b79af56ee..02ca3e460 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b diff --git a/eng/Versions.props b/eng/Versions.props index 84ac7196d..e803e503e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 From 678322278bca2cdd5c89614711b3f7c7f1f3c3a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:48:51 +0000 Subject: [PATCH 015/249] Update dependencies from https://github.com/dotnet/arcade-services build 20221107.2 (#14910) [main] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6e0b834c7..59a557da7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22554.5", + "version": "1.1.0-beta.22557.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 026ced089..0e9952c57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - aa6e835ea5e8ef70a95a8fa6075fdf4c73de8bd8 + 09c0d1e48621eb3b85257ec0c3af9814c33665a1 - + https://github.com/dotnet/arcade-services - aa6e835ea5e8ef70a95a8fa6075fdf4c73de8bd8 + 09c0d1e48621eb3b85257ec0c3af9814c33665a1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3363dcd0b..7c7fc174e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22554.5 + 1.1.0-beta.22557.2 From 830fc96608fa554bea2184b51f872e85de72d8a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 00:31:26 +0000 Subject: [PATCH 016/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221107.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22557.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e9952c57..bc4b994c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 - + https://github.com/dotnet/source-build-reference-packages - dab1b0db4f4937b9213c5aecc5a5279d88180741 + 4957077bf92bf720b0619fdf706be132e3b42a07 From e8d044ead7c830fd926e56f665d039d9fd826838 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 01:43:08 +0000 Subject: [PATCH 017/249] Update dependencies from https://github.com/dotnet/sdk build 20221107.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 889fdc9ff..00562bf27 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e9952c57..3605e30d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 26225a22013419a9d10fa6fe11fb61beeaf5006f + b6898d6622ea223cbf53e6a6041803213f67f73f - + https://github.com/dotnet/sdk - 26225a22013419a9d10fa6fe11fb61beeaf5006f + b6898d6622ea223cbf53e6a6041803213f67f73f - + https://github.com/dotnet/sdk - 26225a22013419a9d10fa6fe11fb61beeaf5006f + b6898d6622ea223cbf53e6a6041803213f67f73f - + https://github.com/dotnet/sdk - 26225a22013419a9d10fa6fe11fb61beeaf5006f + b6898d6622ea223cbf53e6a6041803213f67f73f diff --git a/eng/Versions.props b/eng/Versions.props index 7c7fc174e..48b5e6d90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22556.3 - 8.0.100-alpha.1.22556.3 + 8.0.100-alpha.1.22557.7 + 8.0.100-alpha.1.22557.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From caec57b464025756ba926dd7a620c2e9841cf11f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 02:51:30 +0000 Subject: [PATCH 018/249] Update dependencies from https://github.com/dotnet/sdk build 20221107.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22552.1 -> To Version 7.0.100-1.22557.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00562bf27..7a34af5de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3605e30d7..f7caee7df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - b6898d6622ea223cbf53e6a6041803213f67f73f + 3077626cfd04aecbc0de02075535486ca45893e0 - + https://github.com/dotnet/sdk - b6898d6622ea223cbf53e6a6041803213f67f73f + 3077626cfd04aecbc0de02075535486ca45893e0 - + https://github.com/dotnet/sdk - b6898d6622ea223cbf53e6a6041803213f67f73f + 3077626cfd04aecbc0de02075535486ca45893e0 - + https://github.com/dotnet/sdk - b6898d6622ea223cbf53e6a6041803213f67f73f + 3077626cfd04aecbc0de02075535486ca45893e0 @@ -142,9 +142,9 @@ 02de16cd2915e7b34ffe91ab73432ba4faf4baf8 - + https://github.com/dotnet/linker - 391ac60bbfb2c618b82f08af728d2d4d259d584e + dc5e60f5f2becf0b462d37ad918443126e80b49b linker diff --git a/eng/Versions.props b/eng/Versions.props index 48b5e6d90..706f1524e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22557.7 - 8.0.100-alpha.1.22557.7 + 8.0.100-alpha.1.22557.11 + 8.0.100-alpha.1.22557.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8a9774d03eeba98ad4ff999a65f2b6601257540 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 03:57:43 +0000 Subject: [PATCH 019/249] Update dependencies from https://github.com/dotnet/sdk build 20221107.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks From Version 8.0.0-alpha.1.22554.2 -> To Version 8.0.0-alpha.1.22557.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a34af5de..66dcd5ce9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7caee7df..f79a830c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime bdd67af67dbf43c0f5e9151b98dc100b9555898a - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 - + https://github.com/dotnet/aspnetcore - aeccdb94ee13cc9e88497c04c19317366bf0b9da + a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 3077626cfd04aecbc0de02075535486ca45893e0 + ed9877b7eeda4ab25a8a512509b14f9350faefdf - + https://github.com/dotnet/sdk - 3077626cfd04aecbc0de02075535486ca45893e0 + ed9877b7eeda4ab25a8a512509b14f9350faefdf - + https://github.com/dotnet/sdk - 3077626cfd04aecbc0de02075535486ca45893e0 + ed9877b7eeda4ab25a8a512509b14f9350faefdf - + https://github.com/dotnet/sdk - 3077626cfd04aecbc0de02075535486ca45893e0 + ed9877b7eeda4ab25a8a512509b14f9350faefdf diff --git a/eng/Versions.props b/eng/Versions.props index 706f1524e..751cfcb98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 - 8.0.0-alpha.1.22554.2 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.5 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22557.11 - 8.0.100-alpha.1.22557.11 + 8.0.100-alpha.1.22557.12 + 8.0.100-alpha.1.22557.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4040e4f9a1cfda5746dd23f8ab6e93763587689d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 06:27:19 +0000 Subject: [PATCH 020/249] Update dependencies from https://github.com/dotnet/sdk build 20221107.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.5.0-beta.22553.12 -> To Version 12.5.0-beta.22555.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 66dcd5ce9..13f276cad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95fb1e4f5..ed050e87a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - ed9877b7eeda4ab25a8a512509b14f9350faefdf + 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 - + https://github.com/dotnet/sdk - ed9877b7eeda4ab25a8a512509b14f9350faefdf + 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 - + https://github.com/dotnet/sdk - ed9877b7eeda4ab25a8a512509b14f9350faefdf + 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 - + https://github.com/dotnet/sdk - ed9877b7eeda4ab25a8a512509b14f9350faefdf + 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 @@ -128,18 +128,18 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - abd1cc91bc32b1007e7513c6cd55312e9a7835b4 + 7326f5a34b73e3a3eead66ac394f61afc01d4623 - + https://github.com/dotnet/fsharp - abd1cc91bc32b1007e7513c6cd55312e9a7835b4 + 7326f5a34b73e3a3eead66ac394f61afc01d4623 - + https://github.com/microsoft/vstest - 02de16cd2915e7b34ffe91ab73432ba4faf4baf8 + 6e064f9dbe9b824898a9e4c5a161f7886bf85a66 diff --git a/eng/Versions.props b/eng/Versions.props index f491043a7..f3a234385 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22557.12 - 8.0.100-alpha.1.22557.12 + 8.0.100-alpha.1.22557.20 + 8.0.100-alpha.1.22557.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221103-01 + 17.5.0-preview-20221107-04 7.0.0-rc.1.22426.10 From 633c4eb57faa4642ed594672640e55d36fb2dcfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 08:24:03 +0000 Subject: [PATCH 021/249] Update dependencies from https://github.com/dotnet/sdk build 20221107.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22557.5 -> To Version 8.0.0-alpha.1.22557.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13f276cad..af9b681fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed050e87a..be8bf6196 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime bdd67af67dbf43c0f5e9151b98dc100b9555898a - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 - + https://github.com/dotnet/aspnetcore - a251cb3edc63a8789da24b801a9fcd3e3bb1cc16 + 70ce9edb24d44ed320f5b94402f91b9c023a24a2 https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 + 7787c907bac2a2bf86ca9374a9dd8d213136d051 - + https://github.com/dotnet/sdk - 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 + 7787c907bac2a2bf86ca9374a9dd8d213136d051 - + https://github.com/dotnet/sdk - 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 + 7787c907bac2a2bf86ca9374a9dd8d213136d051 - + https://github.com/dotnet/sdk - 714bdb380f3c3eb172d666e68ed6aa99f2a177a5 + 7787c907bac2a2bf86ca9374a9dd8d213136d051 diff --git a/eng/Versions.props b/eng/Versions.props index f3a234385..17503a9b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 - 8.0.0-alpha.1.22557.5 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.9 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22557.20 - 8.0.100-alpha.1.22557.20 + 8.0.100-alpha.1.22557.21 + 8.0.100-alpha.1.22557.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef848cd34b842796e434da94db1c6c77b22463f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 10:02:44 +0000 Subject: [PATCH 022/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index af9b681fa..b20b79b19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be8bf6196..7e256cb0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 7787c907bac2a2bf86ca9374a9dd8d213136d051 + 1262fcf1f37b592e9540fb009a8aebb120f3ba25 - + https://github.com/dotnet/sdk - 7787c907bac2a2bf86ca9374a9dd8d213136d051 + 1262fcf1f37b592e9540fb009a8aebb120f3ba25 - + https://github.com/dotnet/sdk - 7787c907bac2a2bf86ca9374a9dd8d213136d051 + 1262fcf1f37b592e9540fb009a8aebb120f3ba25 - + https://github.com/dotnet/sdk - 7787c907bac2a2bf86ca9374a9dd8d213136d051 + 1262fcf1f37b592e9540fb009a8aebb120f3ba25 diff --git a/eng/Versions.props b/eng/Versions.props index 17503a9b0..3fc2d8c87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22557.21 - 8.0.100-alpha.1.22557.21 + 8.0.100-alpha.1.22558.5 + 8.0.100-alpha.1.22558.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dde4f4f76cd20a2e3309140f83c9375c5f251a60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 11:04:07 +0000 Subject: [PATCH 023/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22557.9 -> To Version 8.0.0-alpha.1.22557.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index b20b79b19..1a0090faa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e256cb0f..e246cdf22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime bdd67af67dbf43c0f5e9151b98dc100b9555898a - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 - + https://github.com/dotnet/aspnetcore - 70ce9edb24d44ed320f5b94402f91b9c023a24a2 + 4c300ec6db7117a05b7c79cf6f617e9d498212b6 https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 1262fcf1f37b592e9540fb009a8aebb120f3ba25 + 6e95bf9ffbac9ad034732418258d3445c43109db - + https://github.com/dotnet/sdk - 1262fcf1f37b592e9540fb009a8aebb120f3ba25 + 6e95bf9ffbac9ad034732418258d3445c43109db - + https://github.com/dotnet/sdk - 1262fcf1f37b592e9540fb009a8aebb120f3ba25 + 6e95bf9ffbac9ad034732418258d3445c43109db - + https://github.com/dotnet/sdk - 1262fcf1f37b592e9540fb009a8aebb120f3ba25 + 6e95bf9ffbac9ad034732418258d3445c43109db diff --git a/eng/Versions.props b/eng/Versions.props index 3fc2d8c87..b4cb520cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 - 8.0.0-alpha.1.22557.9 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22557.11 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22558.5 - 8.0.100-alpha.1.22558.5 + 8.0.100-alpha.1.22558.6 + 8.0.100-alpha.1.22558.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a30ceab729e384448ca514859a5f1529cee7a098 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 14:30:31 +0000 Subject: [PATCH 024/249] Update dependencies from https://github.com/dotnet/test-templates build 20221108.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.22557.2 -> To Version 1.1.0-rc.22558.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be8bf6196..734c7b99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 17503a9b0..cbaaf2e14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,10 +43,10 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 From 9298d5c47839e5baa814270cd2571541c91ab706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 16:21:49 +0000 Subject: [PATCH 025/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22557.9 -> To Version 8.0.0-alpha.1.22557.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a0090faa..e1e541551 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e246cdf22..32c31a14f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 6e95bf9ffbac9ad034732418258d3445c43109db + aef3f55eb6d58fbe15e28c2363da54940c3635d7 - + https://github.com/dotnet/sdk - 6e95bf9ffbac9ad034732418258d3445c43109db + aef3f55eb6d58fbe15e28c2363da54940c3635d7 - + https://github.com/dotnet/sdk - 6e95bf9ffbac9ad034732418258d3445c43109db + aef3f55eb6d58fbe15e28c2363da54940c3635d7 - + https://github.com/dotnet/sdk - 6e95bf9ffbac9ad034732418258d3445c43109db + aef3f55eb6d58fbe15e28c2363da54940c3635d7 diff --git a/eng/Versions.props b/eng/Versions.props index b4cb520cf..b7d4a8290 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22558.6 - 8.0.100-alpha.1.22558.6 + 8.0.100-alpha.1.22558.7 + 8.0.100-alpha.1.22558.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b20a1eae03b4a06b4f33e49f495084d78e2c4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 8 Nov 2022 17:47:32 +0100 Subject: [PATCH 026/249] Add a VMR synchronization PR validation (#14918) Adds a new pipeline that will run during installer's PRs that verifies that the current VMR tooling can synchronize that particular change into the VMR. --- .../templates/jobs/vmr-synchronization.yml | 103 ------------------ eng/pipelines/templates/steps/vmr-prepare.yml | 28 +++++ .../templates/steps/vmr-pull-updates.yml | 60 ++++++++++ .../templates/variables/vmr-variables.yml | 9 ++ eng/pipelines/vmr-synchronization.yml | 74 +++++++++++++ eng/pipelines/vmr-validation.yml | 51 +++++++++ eng/vmr-synchronization.yml | 47 -------- 7 files changed, 222 insertions(+), 150 deletions(-) delete mode 100644 eng/pipelines/templates/jobs/vmr-synchronization.yml create mode 100644 eng/pipelines/templates/steps/vmr-prepare.yml create mode 100644 eng/pipelines/templates/steps/vmr-pull-updates.yml create mode 100644 eng/pipelines/templates/variables/vmr-variables.yml create mode 100644 eng/pipelines/vmr-synchronization.yml create mode 100644 eng/pipelines/vmr-validation.yml delete mode 100644 eng/vmr-synchronization.yml diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml deleted file mode 100644 index 6b4ee5bb6..000000000 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ /dev/null @@ -1,103 +0,0 @@ -### These steps synchronize code from product repositories into the VMR (https://github.com/dotnet/dotnet) - -parameters: -- name: targetRef - displayName: Target revision in dotnet/installer to synchronize - type: string - default: $(Build.SourceVersion) - -- name: vmrBranch - displayName: dotnet/dotnet branch to use - type: string - default: $(Build.SourceBranchName) - -- name: vmrToken - displayName: PAT that allows pushing to dotnet/dotnet - type: string - -- name: noPush - displayName: Don't push changes to dotnet/dotnet - type: boolean - default: false - -jobs: -- job: Synchronize - displayName: Synchronize dotnet/dotnet - timeoutInMinutes: 120 - - variables: - - name: vmrPath - value: $(Agent.BuildDirectory)/vmr - - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public - demands: - - ImageOverride -equals Build.Ubuntu.2004.Amd64.Open - ${{ else }}: - name: NetCore1ESPool-Internal - demands: - - ImageOverride -equals Build.Ubuntu.2004.Amd64 - - steps: - - checkout: self - clean: true - displayName: Checkout dotnet/installer - fetchDepth: 0 - path: installer - - - checkout: vmr - clean: true - displayName: Checkout dotnet/dotnet - fetchDepth: 0 - path: vmr - - # TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG? - # Currently, we ignore dirs of individual repos - they have been scanned before - - ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: ComponentGovernanceComponentDetection@0 - inputs: - sourceScanPath: $(vmrPath) - ignoreDirectories: $(vmrPath)/src - - - script: |- - source ./eng/common/tools.sh - InitializeDotNetCli true - ./.dotnet/dotnet tool restore - displayName: Restore toolset - workingDirectory: $(Agent.BuildDirectory)/installer - - # TODO (https://github.com/dotnet/arcade/issues/11386): Remove this step - # This step is here so that darc can find the PR commit (which might be in some fork) - # We need to make darc understand that it needs to look in the fork from this PR - - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - script: |- - cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/installer - displayName: '[PR Only] Prepare dotnet/installer clone' - - - script: git checkout -B ${{ parameters.vmrBranch }} - displayName: Prepare branch ${{ parameters.vmrBranch }} - workingDirectory: $(vmrPath) - - - script: > - $(Agent.BuildDirectory)/installer/.dotnet/dotnet darc vmr update - --vmr $(vmrPath) - --tmp $(Agent.TempDirectory) - --azdev-pat $(System.AccessToken) - --github-pat ${{ parameters.vmrToken }} - --recursive - --verbose - installer:${{ parameters.targetRef }} - displayName: Synchronize dotnet/dotnet - workingDirectory: $(Agent.BuildDirectory)/installer - - - ${{ if and(not(parameters.noPush), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: - - script: |- - set -x - git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' - git remote add dotnet 'https://${{ parameters.vmrToken }}@github.com/dotnet/dotnet.git' - git fetch dotnet - git branch --set-upstream-to=dotnet/${{ parameters.vmrBranch }} ${{ parameters.vmrBranch }} || echo 'Branch ${{ parameters.vmrBranch }} not found in remote' - git push dotnet ${{ parameters.vmrBranch }} - displayName: Push changes to dotnet/dotnet - workingDirectory: $(vmrPath) diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml new file mode 100644 index 000000000..5a18630f9 --- /dev/null +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -0,0 +1,28 @@ +### These steps clone the VMR (https://github.com/dotnet/dotnet) into $(Agent.BuildDirectory)/vmr +### Component Governance scan is also triggered over the VMR's non-repo sources + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + default: $(Build.SourceBranchName) + +steps: +- checkout: vmr + clean: true + displayName: Clone dotnet/dotnet + fetchDepth: 0 + path: vmr + +- script: | + git switch -c ${{ parameters.vmrBranch }} + displayName: Checkout ${{ parameters.vmrBranch }} + workingDirectory: $(Agent.BuildDirectory)/vmr + +# TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG? +# Currently, we ignore dirs of individual repos - they have been scanned before +- ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: + - task: ComponentGovernanceComponentDetection@0 + inputs: + sourceScanPath: $(Agent.BuildDirectory)/vmr + ignoreDirectories: $(Agent.BuildDirectory)/vmr/src diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml new file mode 100644 index 000000000..bef0af718 --- /dev/null +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -0,0 +1,60 @@ +### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet). +### They initialize the darc CLI and pull the new updates. +### Changes are applied locally onto the already cloned VMR (located in $vmrPath). + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + +- name: targetRef + displayName: Target revision in dotnet/installer to synchronize + type: string + default: $(Build.SourceVersion) + +- name: vmrToken + displayName: PAT that allows pushing to dotnet/dotnet + type: string + +- name: vmrPath + displayName: Path where the dotnet/dotnet is checked out to + type: string + default: $(Agent.BuildDirectory)/vmr + +steps: +- checkout: self + clean: true + displayName: Clone dotnet/installer + fetchDepth: 0 + path: installer + +- script: | + source ./eng/common/tools.sh + InitializeDotNetCli true + ./.dotnet/dotnet tool restore + displayName: Restore darc + workingDirectory: $(Agent.BuildDirectory)/installer + +- script: git checkout -B ${{ parameters.vmrBranch }} + displayName: Prepare branch ${{ parameters.vmrBranch }} + workingDirectory: $(vmrPath) + +# TODO (https://github.com/dotnet/arcade/issues/11386): Remove this step +# This step is here so that darc can find the PR commit (which might be in some fork) +# We need to make darc understand that it needs to look in the fork from this PR +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - script: | + cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/497F233644435505515AF465112B48CD + displayName: Prepare dotnet/installer clone + +- script: > + $(Agent.BuildDirectory)/installer/.dotnet/dotnet darc vmr update + --vmr ${{ parameters.vmrPath }} + --tmp $(Agent.TempDirectory) + --azdev-pat $(System.AccessToken) + --github-pat ${{ parameters.vmrToken }} + --recursive + --verbose + installer:${{ parameters.targetRef }} + displayName: Synchronize dotnet/dotnet + workingDirectory: $(Agent.BuildDirectory)/installer diff --git a/eng/pipelines/templates/variables/vmr-variables.yml b/eng/pipelines/templates/variables/vmr-variables.yml new file mode 100644 index 000000000..0d6af8fff --- /dev/null +++ b/eng/pipelines/templates/variables/vmr-variables.yml @@ -0,0 +1,9 @@ +variables: +- name: vmrPath + value: $(Agent.BuildDirectory)/vmr + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBot-GitHub +- ${{ else }}: + - name: BotAccount-dotnet-bot-repo-PAT + value: N/A \ No newline at end of file diff --git a/eng/pipelines/vmr-synchronization.yml b/eng/pipelines/vmr-synchronization.yml new file mode 100644 index 000000000..cf624ab12 --- /dev/null +++ b/eng/pipelines/vmr-synchronization.yml @@ -0,0 +1,74 @@ +### This pipeline synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet) + +parameters: +- name: targetRef + displayName: Target revision in dotnet/installer to synchronize to + type: string + default: $(Build.SourceVersion) + +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + default: $(Build.SourceBranchName) + +- name: noPush + displayName: Don't push changes to dotnet/dotnet + type: boolean + default: false + +trigger: + branches: + include: + - main + - release/* + - internal/release/* + +pr: none + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +variables: +- template: /eng/common/templates/variables/pool-providers.yml +- template: templates/variables/vmr-variables.yml + +jobs: +- job: Synchronize + displayName: Synchronize dotnet/dotnet + timeoutInMinutes: 120 + + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 + + steps: + - template: templates/steps/vmr-prepare.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + + - template: templates/steps/vmr-pull-updates.yml + parameters: + vmrPath: $(vmrPath) + vmrBranch: ${{ parameters.vmrBranch }} + targetRef: ${{ parameters.targetRef }} + vmrToken: $(BotAccount-dotnet-bot-repo-PAT) + + - ${{ if and(not(parameters.noPush), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: + - script: |- + set -x + git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' + git remote add dotnet 'https://$(BotAccount-dotnet-bot-repo-PAT)@github.com/dotnet/dotnet.git' + git fetch dotnet + git branch ${{ parameters.vmrBranch }} + git branch --set-upstream-to=dotnet/${{ parameters.vmrBranch }} ${{ parameters.vmrBranch }} || echo 'Branch ${{ parameters.vmrBranch }} not found in remote' + git push dotnet ${{ parameters.vmrBranch }} + displayName: Push changes to dotnet/dotnet + workingDirectory: $(vmrPath) diff --git a/eng/pipelines/vmr-validation.yml b/eng/pipelines/vmr-validation.yml new file mode 100644 index 000000000..bdd0bbd31 --- /dev/null +++ b/eng/pipelines/vmr-validation.yml @@ -0,0 +1,51 @@ +### This pipeline validates new changes of the VMR (https://github.com/dotnet/dotnet) +### VMR is cloned and updates are applied locally + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + default: $(System.PullRequest.TargetBranch) + +trigger: none + +pr: + branches: + include: + - main + - release/* + - internal/release/* + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: public + +variables: +- template: /eng/common/templates/variables/pool-providers.yml +- template: templates/variables/vmr-variables.yml + +jobs: +- job: Validate + displayName: Test VMR synchronization + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 + + steps: + - template: templates/steps/vmr-prepare.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + + - template: templates/steps/vmr-pull-updates.yml + parameters: + vmrPath: $(vmrPath) + vmrBranch: ${{ parameters.vmrBranch }} + targetRef: $(Build.SourceVersion) + vmrToken: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/vmr-synchronization.yml b/eng/vmr-synchronization.yml deleted file mode 100644 index 84e52e3f3..000000000 --- a/eng/vmr-synchronization.yml +++ /dev/null @@ -1,47 +0,0 @@ -### This pipeline synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet) - -parameters: -- name: targetRef - displayName: Target revision in dotnet/installer to synchronize - type: string - default: $(Build.SourceVersion) - -- name: vmrBranch - displayName: dotnet/dotnet branch to use - type: string - default: $(Build.SourceBranchName) - -- name: noPush - displayName: Don't push changes to dotnet/dotnet - type: boolean - default: false - -trigger: - branches: - include: - - main - -pr: none - -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - -variables: -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBot-GitHub - -- ${{ else }}: - - name: BotAccount-dotnet-bot-repo-PAT - value: N/A - -jobs: -- template: ./pipelines/templates/jobs/vmr-synchronization.yml - parameters: - targetRef: ${{ parameters.targetRef }} - vmrBranch: ${{ parameters.vmrBranch }} - vmrToken: $(BotAccount-dotnet-bot-repo-PAT) - noPush: ${{ parameters.noPush }} From 1c49699041cd0eebaedc36da055c4c3edf8aa6d7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 8 Nov 2022 11:13:26 -0600 Subject: [PATCH 027/249] Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14922) --- eng/source-build-tarball-build-official.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 38753d24d..5d396baab 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -10,6 +10,11 @@ resources: - main - release/* - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx stages: - build From e08df07164e1d404ac110cdc3ebd7edc950d689f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 17:32:32 +0000 Subject: [PATCH 028/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22551.9 -> To Version 8.0.0-alpha.1.22557.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1e541551..3e8b3d951 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32c31a14f..309a3a93e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a https://github.com/dotnet/aspnetcore @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - aef3f55eb6d58fbe15e28c2363da54940c3635d7 + c6b589914c0ffefbbe8546d2fd838184348fc56f - + https://github.com/dotnet/sdk - aef3f55eb6d58fbe15e28c2363da54940c3635d7 + c6b589914c0ffefbbe8546d2fd838184348fc56f - + https://github.com/dotnet/sdk - aef3f55eb6d58fbe15e28c2363da54940c3635d7 + c6b589914c0ffefbbe8546d2fd838184348fc56f - + https://github.com/dotnet/sdk - aef3f55eb6d58fbe15e28c2363da54940c3635d7 + c6b589914c0ffefbbe8546d2fd838184348fc56f diff --git a/eng/Versions.props b/eng/Versions.props index b7d4a8290..ae2608022 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,24 +68,24 @@ 8.0.100 - 8.0.100-alpha.1.22558.7 - 8.0.100-alpha.1.22558.7 + 8.0.100-alpha.1.22558.8 + 8.0.100-alpha.1.22558.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22551.9 + 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22551.9 - 8.0.0-alpha.1.22551.9 - 8.0.0-alpha.1.22551.9 - 8.0.0-alpha.1.22551.9 - 8.0.0-alpha.1.22551.9 - 8.0.0-alpha.1.22551.9 + 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22557.12 2.1.0 From b6295277acb3d737336cd0370c9aaa702ac1d3f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 18:40:46 +0000 Subject: [PATCH 029/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22551.9 -> To Version 8.0.0-alpha.1.22557.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e8b3d951..8e6a95f2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 309a3a93e..113b39ad6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - c6b589914c0ffefbbe8546d2fd838184348fc56f + 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec - + https://github.com/dotnet/sdk - c6b589914c0ffefbbe8546d2fd838184348fc56f + 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec - + https://github.com/dotnet/sdk - c6b589914c0ffefbbe8546d2fd838184348fc56f + 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec - + https://github.com/dotnet/sdk - c6b589914c0ffefbbe8546d2fd838184348fc56f + 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec diff --git a/eng/Versions.props b/eng/Versions.props index ae2608022..e8a3b8efd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22558.8 - 8.0.100-alpha.1.22558.8 + 8.0.100-alpha.1.22558.9 + 8.0.100-alpha.1.22558.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3dbd8d537300ada723b90ef873021fb3b316dcca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 18:55:45 +0000 Subject: [PATCH 030/249] Update dependencies from https://github.com/dotnet/arcade build 20221107.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22531.4 -> To Version 7.0.0-beta.22557.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02ca3e460..afb6c38e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e803e503e..e6fb084c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 diff --git a/global.json b/global.json index 9f6b90beb..d7ac65792 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22531.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22557.1" } } From 0c71204f91743efd32f94f04aa0fbdfee9030b1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 20:04:53 +0000 Subject: [PATCH 031/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 8.0.0-alpha.1.22551.9 -> To Version 8.0.0-alpha.1.22557.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e6a95f2a..6a257dd28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 113b39ad6..28df15dd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec + 570935b65820b9c934344b4dbe1286a5c6f841ce - + https://github.com/dotnet/sdk - 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec + 570935b65820b9c934344b4dbe1286a5c6f841ce - + https://github.com/dotnet/sdk - 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec + 570935b65820b9c934344b4dbe1286a5c6f841ce - + https://github.com/dotnet/sdk - 96fc61c68f3b6d66226ddad19ec4ab008fc8c3ec + 570935b65820b9c934344b4dbe1286a5c6f841ce @@ -128,18 +128,18 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 7326f5a34b73e3a3eead66ac394f61afc01d4623 + a6a64706c78963cb033fd230f36518d3e773b725 - + https://github.com/dotnet/fsharp - 7326f5a34b73e3a3eead66ac394f61afc01d4623 + a6a64706c78963cb033fd230f36518d3e773b725 - + https://github.com/microsoft/vstest - 6e064f9dbe9b824898a9e4c5a161f7886bf85a66 + 02296a2873652bc5911ae4b58d74f9faae03917d diff --git a/eng/Versions.props b/eng/Versions.props index e8a3b8efd..71f7f6d53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22558.9 - 8.0.100-alpha.1.22558.9 + 8.0.100-alpha.1.22558.14 + 8.0.100-alpha.1.22558.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221107-04 + 17.5.0-preview-20221107-06 7.0.0-rc.1.22426.10 From a375f957ca8004e0580a51073f4014f3eb8de51f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 02:47:23 +0000 Subject: [PATCH 032/249] Update dependencies from https://github.com/dotnet/sdk build 20221108.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22557.11 -> To Version 8.0.0-alpha.1.22558.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a257dd28..da731f31f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2b6db61c..da262c6a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/aspnetcore - 4c300ec6db7117a05b7c79cf6f617e9d498212b6 + 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 570935b65820b9c934344b4dbe1286a5c6f841ce + 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 - + https://github.com/dotnet/sdk - 570935b65820b9c934344b4dbe1286a5c6f841ce + 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 - + https://github.com/dotnet/sdk - 570935b65820b9c934344b4dbe1286a5c6f841ce + 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 - + https://github.com/dotnet/sdk - 570935b65820b9c934344b4dbe1286a5c6f841ce + 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 diff --git a/eng/Versions.props b/eng/Versions.props index b15acd3ec..065583bf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 - 8.0.0-alpha.1.22557.11 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22558.5 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22558.14 - 8.0.100-alpha.1.22558.14 + 8.0.100-alpha.1.22558.25 + 8.0.100-alpha.1.22558.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 905f360f4353cb4e481711636716bd0e9bbcf44d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 13:22:08 +0000 Subject: [PATCH 033/249] Update dependencies from https://github.com/dotnet/emsdk build 20221108.2 Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 8.0.0-alpha.1.22554.1 -> To Version 8.0.0-alpha.1.22558.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da262c6a8..b7070af96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b6656f5b78cd25f984355f973e65da3d844ac6d1 + 96351a7e97093d88eb097b4a489f949ebf8a901b - + https://github.com/dotnet/emsdk - b6656f5b78cd25f984355f973e65da3d844ac6d1 + 96351a7e97093d88eb097b4a489f949ebf8a901b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 065583bf8..30ad3fe39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,8 +221,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22554.1 - 8.0.0-alpha.1.22554.1 + 8.0.0-alpha.1.22558.2 + 8.0.0-alpha.1.22558.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From 198829ed34a34f10ef451b443b2d04c086799e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 9 Nov 2022 19:37:29 +0100 Subject: [PATCH 034/249] Do not restore/copy text-only packages into the VMR (#14946) --- src/VirtualMonoRepo/InitializeVMR.proj | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index df78ccce6..8146ae460 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -33,9 +33,7 @@ + InitializeRepoAndDependentsRecursive"> @@ -81,9 +79,4 @@ - - - - - From 272c31430868cd6f9abfec3442159f52e8bf4ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 9 Nov 2022 20:14:07 +0100 Subject: [PATCH 035/249] Add content (README, licenses, TPN...) for the VMR (#14848) --- .../tarball/content/CODE_OF_CONDUCT.md | 6 + src/SourceBuild/tarball/content/LICENSE.TXT | 23 +++ src/SourceBuild/tarball/content/SECURITY.md | 41 +++++ .../content/eng/bootstrap/README.template.md | 160 ++++++++++++++++++ .../THIRD-PARTY-NOTICES.template.txt | 13 ++ 5 files changed, 243 insertions(+) create mode 100644 src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md create mode 100644 src/SourceBuild/tarball/content/LICENSE.TXT create mode 100644 src/SourceBuild/tarball/content/SECURITY.md create mode 100644 src/SourceBuild/tarball/content/eng/bootstrap/README.template.md create mode 100644 src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt diff --git a/src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md b/src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..775f221c9 --- /dev/null +++ b/src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md @@ -0,0 +1,6 @@ +# Code of Conduct + +This project has adopted the code of conduct defined by the Contributor Covenant +to clarify expected behavior in our community. + +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). diff --git a/src/SourceBuild/tarball/content/LICENSE.TXT b/src/SourceBuild/tarball/content/LICENSE.TXT new file mode 100644 index 000000000..a616ed188 --- /dev/null +++ b/src/SourceBuild/tarball/content/LICENSE.TXT @@ -0,0 +1,23 @@ +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/SECURITY.md b/src/SourceBuild/tarball/content/SECURITY.md new file mode 100644 index 000000000..e0dfff56a --- /dev/null +++ b/src/SourceBuild/tarball/content/SECURITY.md @@ -0,0 +1,41 @@ + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd). + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md new file mode 100644 index 000000000..cd25d2af1 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md @@ -0,0 +1,160 @@ +# dotnet/dotnet - Home of the .NET VMR + +This repository is a **Virtual Monolithic Repository (VMR)** which includes all the source code and infrastructure needed to build the .NET SDK. + +What this means: +- **Monolithic** - a join of multiple repositories that make up the whole product, such as [dotnet/runtime](https://github.com/dotnet/runtime) or [dotnet/sdk](https://github.com/dotnet/sdk). +- **Virtual** - a mirror (not replacement) of product repos where sources from those repositories are synchronized into. +- **Experimental** - not to be depended on as we reserve the right to delete the current instance and create a new, different one in its stead. See [Limitations](#limitations). + +In the VMR, you can find: +- source files of [each product repository](#list-of-components) which are mirrored inside of their respective directories under [`src/`](https://github.com/dotnet/dotnet/tree/main/src), +- tooling that enables [building the whole .NET product from source](https://github.com/dotnet/source-build) on Linux platforms, +- small customizations, in the form of [patches](https://github.com/dotnet/dotnet/tree/main/src/installer/src/SourceBuild/tarball/patches), applied on top of the original code to make the build possible, +- *[in future]* E2E tests for the whole .NET product. + +Just like the development repositories, the VMR will have a release branch for every feature band (e.g. `release/8.0.1xx-preview1`). +Similarly, VMR's `main` branch will follow `main` branches of product repositories (see [Synchronization Based on Declared Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies)). + +More in-depth documentation about the VMR can be found in [VMR Design And Operation](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#layout). +See also [dotnet/source-build](https://github.com/dotnet/source-build) for more information about our whole-product source-build. + +## Goals + +- The main purpose of the [dotnet/dotnet](https://github.com/dotnet/dotnet) repository is to have all source code necessary to build the .NET product available in one repository and identified by a single commit. +- The VMR also aims to become the place from which we release and service future versions of .NET to reduce the complexity of the product construction process. This should allow our partners and and 3rd parties to easily build, test and modify .NET using their custom infrastructure as well as make the process available to the community. +- Lastly, we hope to solve other problems that the current multi-repo setup brings: + - Enable the standard [down-/up-stream open-source model](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md). + - Fulfill requirements of .NET distro builders such as RedHat or Canonical to natively include .NET in their distribution repositories. + - Simplify scenarios such as client-run testing of bug fixes and improvements. The build should work in an offline environment too for certain platforms. + - Enable developers to make and test changes spanning multiple repositories. + - More efficient pipeline for security fixes during the CVE pre-disclosure process. + +## Limitations + +**This is a work-in-progress and an experiment.** +There are considerable limitations to what is possible at the moment. For an extensive list of current limitations, please see [Temporary Mechanics](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#temporary-mechanics). + +The VMR is expected to become non-experimental by .NET 8 Preview 1 (Februrary, 2023). +This means it won't be short-lived anymore and we won't be reserving the right to delete and re-create it anymore. +Other limitations might apply until the .NET 9 timeframe. +See the [Unified Build roadmap](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Roadmap.md) for more details. + +### Supported platforms + +The VMR only supports .NET 8.0 and higher. Additionally, source-build currently supports Linux only. +It is expected that Mac and Window will be supported in the .NET 9.0. + +For the latest information about Source-Build support for new .NET versions, please check our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions) for announcements. + +### Online build only + +Building the product offline is not fully working at the moment. The `--online` switch is needed when building the VMR as not all dependencies are currently built from source. + +### Code flow +For the time being, the source code only flows one way - from the development repos into the VMR. +More details on this process: + +- [Source Synchronization Process](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) +- [Synchronization Based on Declared Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies) +- [Moving Code and Dependencies between the VMR and Development Repos](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#moving-code-and-dependencies-between-the-vmr-and-development-repos) + +We expect the code flow to start working both ways in the .NET 9 timeframe. +See the [Unified Build roadmap](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Roadmap.md) for more details. + +### Contribution + +At this time, the VMR will not accept any changes and is a read-only mirror of the development repositories only. +Please, make the changes in the respective development repositories (e.g., [dotnet/runtime](https://github.com/dotnet/runtime) or [dotnet/sdk](https://github.com/dotnet/sdk)) and they will get synchronized into the VMR automatically. + +## Dev instructions + +Please note that **this repository is an experiment and a work-in-progress so it is possible that the build is broken**. +For the latest information about Source-Build support, please watch for announcements posted on our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions). + +### Prerequisites + +The dependencies for building .NET from source can be found [here](https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/linux-requirements.md). + +### Building + +1. **Clone the VMR** + + ```bash + git clone https://github.com/dotnet/dotnet dotnet-dotnet + ``` + +2. **Prep the source to build on your distro** + This downloads a .NET SDK and a number of .NET packages needed to build .NET from source. + + ```bash + cd dotnet-dotnet + ./prep.sh + ``` + +3. **Build the .NET SDK** + + ```bash + ./build.sh --clean-while-building --online + ``` + + This builds the entire .NET SDK from source. + The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-8.0.100-your-RID.tar.gz`. + + Currently, the `--online` flag is required to allow NuGet restore from online sources during the build. + This is useful for testing unsupported releases that don't yet build without downloading pre-built binaries from the internet. + + Run `./build.sh --help` to see more information about supported build options. + +4. *(Optional)* **Unpack and install the .NET SDK** + + ```bash + mkdir -p $HOME/dotnet + tar zxf artifacts/x64/Release/dotnet-sdk-8.0.100-your-RID.tar.gz -C $HOME/dotnet + ln -s $HOME/dotnet/dotnet /usr/bin/dotnet + ``` + + To test your source-built SDK, run the following: + + ```bash + dotnet --info + ``` + +## List of components + +To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: +- [Strategy for managing external source dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) + +### Detailed list + + + +> Auto-generated list of components will go here + + + +The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. + +## Filing Issues + +This repo does not accept issues as of now. Please file issues to the appropriate development repos. +For issues with the VMR itself, please use the [source-build repository](https://github.com/dotnet/source-build). + +## Useful Links + +- Design documentation for the VMR - a set of documents describing the high-level design and the why's and how's + - [Design and Operation](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md) + - [Upstream/Downstream Relationships](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md) + - [Code and Build Workflow](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Code-And-Build-Workflow.md) + - [Strategy for Managing External Source Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [.NET Source-Build](https://github.com/dotnet/source-build) +- [What is .NET](https://dotnet.microsoft.com) + +## .NET Foundation + +.NET Runtime is a [.NET Foundation](https://www.dotnetfoundation.org/projects) project. + +## License + +.NET is licensed under the [MIT](LICENSE.TXT) license. diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt b/src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt new file mode 100644 index 000000000..ede8d240b --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt @@ -0,0 +1,13 @@ +.NET Core uses third-party libraries or other resources that may be +distributed under licenses different than the .NET Core software. + +Attributions and licence notices for test cases originally authored by +third parties can be found in the respective test directories. + +In the event that we accidentally failed to list a required notice, please +bring it to our attention. Post an issue or email us: + + dotnet@microsoft.com + +The attached notices are provided for information only. + From 8128a812f5a89ab7be87841f65ba7b22a95748b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:57:07 -0800 Subject: [PATCH 036/249] Update dependencies from https://github.com/dotnet/arcade build 20221108.4 (#14940) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22557.1 -> To Version 7.0.0-beta.22558.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afb6c38e0..ff01f4301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e6fb084c6..05157a23e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 diff --git a/global.json b/global.json index d7ac65792..dcb720a56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22557.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" } } From 20663112b5c5c18e4fcf22c7b1421d9cd5ccb480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 9 Nov 2022 21:21:25 +0100 Subject: [PATCH 037/249] Update `darc` and synchronize more VMR non-`src/` content (#14944) --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- src/VirtualMonoRepo/source-mappings.json | 14 ++++++++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 59a557da7..f6136c69a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22557.2", + "version": "1.1.0-beta.22559.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7070af96..7e545e184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - 09c0d1e48621eb3b85257ec0c3af9814c33665a1 + 5f08d3d04702feaa49acd692aa3a169512446ee9 - + https://github.com/dotnet/arcade-services - 09c0d1e48621eb3b85257ec0c3af9814c33665a1 + 5f08d3d04702feaa49acd692aa3a169512446ee9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 30ad3fe39..7a4d0ba74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22557.2 + 1.1.0-beta.22559.2 diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index f267114aa..0f2620a51 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -12,8 +12,18 @@ // These patches are applied on top of the code synchronized into the VMR "patchesPath": "src/installer/src/SourceBuild/tarball/patches", - // Files on this path are synchronized with files in the root of the VMR - "contentPath": "src/installer/src/SourceBuild/tarball/content", + // Some files are copied outside of the src/ directory into other locations + // When files in the source paths are changed, they are automatically synchronized too + "additionalMappings": [ + { + "source": "src/installer/src/SourceBuild/tarball/content", + "destination": "" + }, + { + "source": "src/installer/eng/common", + "destination": "eng/common" + } + ], // These defaults are added to all mappings unless `ignoreDefaults: true` is specified // When no "include" filter is specified, "**/*" is used From d9180eec40617ae3b74cbe7daee105d7fd5d8e88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 20:55:14 +0000 Subject: [PATCH 038/249] Update dependencies from https://github.com/dotnet/test-templates build 20221108.1 (#14920) [release/7.0.2xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff01f4301..f8e16bc24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 diff --git a/eng/Versions.props b/eng/Versions.props index 05157a23e..77ed7e54d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 From 8a19c0b5c9936d3523c9df31f74ea93dd599813b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Nov 2022 16:19:34 -0800 Subject: [PATCH 039/249] Switch to the rtm release version for templates. Update the bundled versions Open questions: 1. Does the source build global.json need to be updated too? 2. Why was Microsoft Extensions still 7.0? --- eng/Version.Details.xml | 4 +-- eng/Versions.props | 36 +++++++++---------- global.json | 2 +- .../targets/GenerateBundledVersions.targets | 13 +++---- test/SdkTests/SdkTests.csproj | 2 +- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e545e184..0f1df1e09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,9 +213,9 @@ https://github.com/dotnet/arcade-services 5f08d3d04702feaa49acd692aa3a169512446ee9 - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + af841c8b33cecc92d74222298f1e45bf7bf3d90a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7a4d0ba74..e1d4626f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,16 +111,16 @@ 5.0.403 6.0.302 - 7.0.100-rc.1.22429.2 + 7.0.100 5.0.13 6.0.1 - 7.0.0-rc.1.22427.2 + 7.0.0 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 - 7.0.0-rc.1.22426.4 - 7.0.0-rc.1.22427.1 + 7.0.0-rtm.22518.7 + 7.0.0-rtm.22518.2 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -138,12 +138,12 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - 7.0.0-rc.1.22426.4 - 7.0.0-rc.1.22427.1 + $(MicrosoftWinFormsProjectTemplates70PackageVersion) + $(MicrosoftWPFProjectTemplates70PackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) - 7.0.100-rc.1.22429.2 - 7.0.100-rc.1.22429.2 - 7.0.0-rc.1.22427.2 + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + 7.0.0 $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 17.5.0-preview-20221107-06 - 7.0.0-rc.1.22426.10 + 8.0.0-alpha.1.22557.12 @@ -209,17 +209,17 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.2 + 7.0.100 - 7.0.100-rc.1 - 7.0.0-rc.1.6430 - 33.0.0-rc.1.136 - 15.4.1006-rc.1 - 15.4.1006-rc.1 - 12.3.1006-rc.1 - 15.4.1006-rc.1 + 7.0.100 + 7.0.49 + 33.0.4 + 16.0.1478 + 15.4.2372 + 12.3.2372 + 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) 8.0.0-alpha.1.22558.2 8.0.0-alpha.1.22558.2 diff --git a/global.json b/global.json index fda4cecfe..c6e518bc0 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-alpha.1.22423.9", "runtimes": { "dotnet": [ - "7.0.0-rc.1.22426.10" + "7.0.0" ] } }, diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 595671170..3d270520d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -64,6 +64,7 @@ 30 17 10 + 0 @@ -77,12 +78,12 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET70RuntimePackVersion>7.0.0-rc.1.22426.10 - <_NET70TargetingPackVersion>7.0.0-rc.1.22426.10 - <_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22427.1 - <_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22427.1 - <_AspNet70RuntimePackVersion>7.0.0-rc.1.22427.2 - <_AspNet70TargetingPackVersion>7.0.0-rc.1.22427.2 + <_NET70RuntimePackVersion>7.0.$(VersionFeature70) + <_NET70TargetingPackVersion>7.0.$(VersionFeature70) + <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) + <_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70) + <_AspNet70RuntimePackVersion>7.0.$(VersionFeature70) + <_AspNet70TargetingPackVersion>7.0.$(VersionFeature70) <_NET60RuntimePackVersion>6.0.$(VersionFeature60) <_NET60TargetingPackVersion>6.0.$(VersionFeature60) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 40cb6f5e4..769da7f5f 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,7 +63,7 @@ - + From c860d4ea43fead7d98a0ede5d464188ed14b0196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:03:35 +0000 Subject: [PATCH 040/249] [main] Update dependencies from dotnet/sdk (#14951) * Update dependencies from https://github.com/dotnet/sdk build 20221109.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.2.67 -> To Version 6.5.0-preview.2.69 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Remove backported source-build runtime patch * Update dependencies from https://github.com/dotnet/sdk build 20221109.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Bump DarcLib Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: Premek Vysoky --- .config/dotnet-tools.json | 2 +- NuGet.config | 2 +- eng/Version.Details.xml | 78 +++++++++---------- eng/Versions.props | 22 +++--- ...ObjWriter-dependency-in-source-build.patch | 40 ---------- 5 files changed, 52 insertions(+), 92 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f6136c69a..26b81283a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22559.2", + "version": "1.1.0-beta.22561.2", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index da731f31f..452d38c81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e545e184..e438323f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/aspnetcore @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 @@ -128,39 +128,39 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/microsoft/vstest - 02296a2873652bc5911ae4b58d74f9faae03917d + 4e8b9437a0a5a045f26615a1fbd9d1fc50f6d86f - + https://github.com/dotnet/linker - dc5e60f5f2becf0b462d37ad918443126e80b49b + 9c993bf401377209cd7b4e84b60deab5e4f421a2 linker - + https://github.com/dotnet/roslyn - c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 + 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 3bcada934edfa09e5f68222411e3efeda407985c + 15b127d2445d6b68429f1c31d9ff98fe4e1e728c - + https://github.com/nuget/nuget.client - 6038f769411b98f4efdb10a0924986eae2583618 + a8e878fbc51600caf01d62f0deed5481af7f8aff @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - 5f08d3d04702feaa49acd692aa3a169512446ee9 + e1c11c90d26581339cca9684399250101cbbc3bb - + https://github.com/dotnet/arcade-services - 5f08d3d04702feaa49acd692aa3a169512446ee9 + e1c11c90d26581339cca9684399250101cbbc3bb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a4d0ba74..677a44f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22559.2 + 1.1.0-beta.22561.2 @@ -68,24 +68,24 @@ 8.0.100 - 8.0.100-alpha.1.22558.25 - 8.0.100-alpha.1.22558.25 + 8.0.100-alpha.1.22560.15 + 8.0.100-alpha.1.22560.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 2.1.0 @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221107-06 + 17.5.0-preview-20221109-01 7.0.0-rc.1.22426.10 diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false From 1da909aef3ff70fa52ed0c21dce578dbc813bf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 11 Nov 2022 19:53:17 +0100 Subject: [PATCH 041/249] Fix hash of installer when preparing VMR synchronization (#14962) --- eng/pipelines/templates/steps/vmr-pull-updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index bef0af718..960f58975 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -44,7 +44,7 @@ steps: # We need to make darc understand that it needs to look in the fork from this PR - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - script: | - cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/497F233644435505515AF465112B48CD + cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/03298978DFFFCD23 displayName: Prepare dotnet/installer clone - script: > From 91ff41a8de4ae71a61acf864308094a01b6c5f7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:23:55 +0000 Subject: [PATCH 042/249] Update dependencies from https://github.com/dotnet/sdk build 20221111.5 (#14964) [main] Update dependencies from dotnet/sdk - Merge remote-tracking branch 'origin/main' into darc-main-d920077d-a768-410c-ae08-0f6d0e3d6c00 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 452d38c81..da8234571 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e438323f7..5b0abbeb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 842bd8ac7c6fc8303ff8864515790113e1115991 + 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 - + https://github.com/dotnet/sdk - 842bd8ac7c6fc8303ff8864515790113e1115991 + 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 - + https://github.com/dotnet/sdk - 842bd8ac7c6fc8303ff8864515790113e1115991 + 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 - + https://github.com/dotnet/sdk - 842bd8ac7c6fc8303ff8864515790113e1115991 + 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 diff --git a/eng/Versions.props b/eng/Versions.props index 677a44f61..f286e5117 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22560.15 - 8.0.100-alpha.1.22560.15 + 8.0.100-alpha.1.22561.5 + 8.0.100-alpha.1.22561.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1535517fa4227d40c233f3a5a70fc1b63c5630f8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Nov 2022 13:42:30 -0800 Subject: [PATCH 043/249] Remove extra comment --- src/redist/targets/GenerateBundledVersions.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 3d270520d..855a88489 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -77,7 +77,6 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET70RuntimePackVersion>7.0.$(VersionFeature70) <_NET70TargetingPackVersion>7.0.$(VersionFeature70) <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) From 8905a9927ee244b7b1b666b6f373ecf300695b2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 22:40:11 +0000 Subject: [PATCH 044/249] Update dependencies from https://github.com/dotnet/sdk build 20221111.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221109-01 -> To Version 17.5.0-preview-20221110-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index da8234571..0e1b0b5d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b0abbeb4..5616152ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 + cb5a24da813307788d985e92fd85ac563295b9a1 - + https://github.com/dotnet/sdk - 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 + cb5a24da813307788d985e92fd85ac563295b9a1 - + https://github.com/dotnet/sdk - 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 + cb5a24da813307788d985e92fd85ac563295b9a1 - + https://github.com/dotnet/sdk - 34eb051cd2af2bd2ae2e8827ae4ebbebc91e50f6 + cb5a24da813307788d985e92fd85ac563295b9a1 @@ -137,9 +137,9 @@ 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/microsoft/vstest - 4e8b9437a0a5a045f26615a1fbd9d1fc50f6d86f + 2d45edb6c73ac1c4b1f5fcbc7cfcb6bd1cf2ea6c diff --git a/eng/Versions.props b/eng/Versions.props index f286e5117..3e3092828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22561.5 - 8.0.100-alpha.1.22561.5 + 8.0.100-alpha.1.22561.12 + 8.0.100-alpha.1.22561.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221109-01 + 17.5.0-preview-20221110-01 7.0.0-rc.1.22426.10 From 355d6643bdcd7e5a918550b67d12e35e65d8c646 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Sat, 12 Nov 2022 23:47:45 -0800 Subject: [PATCH 045/249] Fix spelling in VMR's README (#14976) --- .../tarball/content/eng/bootstrap/README.template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md index cd25d2af1..dd184e41a 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md +++ b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md @@ -43,7 +43,7 @@ See the [Unified Build roadmap](https://github.com/dotnet/arcade/blob/main/Docum ### Supported platforms The VMR only supports .NET 8.0 and higher. Additionally, source-build currently supports Linux only. -It is expected that Mac and Window will be supported in the .NET 9.0. +It is expected that Mac and Windows will be supported in the .NET 9.0. For the latest information about Source-Build support for new .NET versions, please check our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions) for announcements. From a9388a7704dac5cfb81ff889253ec26e4f2896a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 04:18:59 +0000 Subject: [PATCH 046/249] Update dependencies from https://github.com/dotnet/sdk build 20221113.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 17.5.0-preview-20221110-01 -> To Version 17.5.0-preview-20221111-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e1b0b5d4..4842389f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5616152ae..d964c0132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - cb5a24da813307788d985e92fd85ac563295b9a1 + 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba - + https://github.com/dotnet/sdk - cb5a24da813307788d985e92fd85ac563295b9a1 + 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba - + https://github.com/dotnet/sdk - cb5a24da813307788d985e92fd85ac563295b9a1 + 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba - + https://github.com/dotnet/sdk - cb5a24da813307788d985e92fd85ac563295b9a1 + 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba @@ -137,9 +137,9 @@ 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/microsoft/vstest - 2d45edb6c73ac1c4b1f5fcbc7cfcb6bd1cf2ea6c + b61973970a544ea30d03ac35b6f5535adb64fd4c @@ -158,9 +158,9 @@ 15b127d2445d6b68429f1c31d9ff98fe4e1e728c - + https://github.com/nuget/nuget.client - a8e878fbc51600caf01d62f0deed5481af7f8aff + ea921bf1871b2799d9c130aad860db33e6577975 diff --git a/eng/Versions.props b/eng/Versions.props index 3e3092828..672c051f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22561.12 - 8.0.100-alpha.1.22561.12 + 8.0.100-alpha.1.22563.2 + 8.0.100-alpha.1.22563.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221110-01 + 17.5.0-preview-20221111-01 7.0.0-rc.1.22426.10 From 55168121bb3ddbe95be136bd5cd71cdc7198f262 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 14 Nov 2022 07:52:14 -0800 Subject: [PATCH 047/249] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#14723) * Adding ppc64le arch for source build (#14631) * Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697) * Remove llvm-project from source-build as we have removed this dependency in runtime. * Add patch for the backport PR to get this to build for now. * Remove unneeded copy of this patch. * [release/7.0.1xx] Update dependencies from dotnet/sdk (#14705) [release/7.0.1xx] Update dependencies from dotnet/sdk - Remove backported command-line-api patch * Don't use the MSBuild server process for init-build.proj. (#14643) * Don't use the MSBuild server process for init-build.proj. This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL. * Address code review feedback. * Update patch backport comments and remove obsolete patch (#14710) * [release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728) * Update source-build to 7.0 RC2 * Also update tarball global.json * Don't touch root global.json in case it is managed by automation * Add back source-build patch that is still required in this branch Co-authored-by: Swapnali911 Co-authored-by: Chris Rummel Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- Directory.Build.props | 1 + eng/Version.Details.xml | 5 - eng/Versions.props | 2 +- .../tarball/content/Directory.Build.props | 1 + src/SourceBuild/tarball/content/build.sh | 2 + src/SourceBuild/tarball/content/global.json | 2 +- .../tarball/content/repos/known-good.proj | 1 - .../tarball/content/repos/llvm-project.proj | 24 -- .../content/repos/runtime-portable.proj | 1 - .../tarball/content/repos/runtime.proj | 1 - ...m-LLVM-directory-to-root-directory-t.patch | 298 ------------------ .../0004-Add-SourceBuild.props.patch | 26 -- .../nuget-client/0002-Add-CA2213-NoWarn.patch | 23 -- ...ilt-assets-during-source-build-for-r.patch | 2 +- ...ObjWriter-dependency-in-source-build.patch | 40 +++ ...02-Look-for-msbuild-net7.0-artifacts.patch | 3 +- src/redist/targets/Crossgen.targets | 4 +- .../targets/GenerateBundledVersions.targets | 9 +- 18 files changed, 56 insertions(+), 389 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/repos/llvm-project.proj delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/Directory.Build.props b/Directory.Build.props index 15c9d27b7..b87eeccca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8e16bc24..7f980082c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,11 +17,6 @@ https://github.com/dotnet/windowsdesktop ae2bcebe032a50af14ac0b05efcaa8477b049834 - - https://github.com/dotnet/llvm-project - 78c9eaec7cec210dfaee9a0443d5816b59683697 - - https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df diff --git a/eng/Versions.props b/eng/Versions.props index 77ed7e54d..ef9ce22a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.1 + 7.0.100-rc.2 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff67..860785575 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -19,6 +19,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 false diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 0d6bbb91e..e899d2f80 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -178,6 +178,8 @@ if [ "$alternateTarget" == "true" ]; then "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver + $CLI_ROOT/dotnet build-server shutdown $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" fi diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d6aba31b..8d9568376 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12" + "dotnet": "7.0.100-rc.2.22477.23" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 937ab8f54..50720cc4c 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -33,7 +33,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj deleted file mode 100644 index addb0457c..000000000 --- a/src/SourceBuild/tarball/content/repos/llvm-project.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - $(BuildCommandArgs) /p:OutputRid=$(PortableRid) - $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj index 6c3939492..09b4625e9 100644 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ b/src/SourceBuild/tarball/content/repos/runtime-portable.proj @@ -9,7 +9,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 04ff19ab1..59ea1d6fc 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -18,7 +18,6 @@ - diff --git a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch b/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch deleted file mode 100644 index 868911a22..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 10 Aug 2022 23:16:19 -0500 -Subject: [PATCH] Copy license form LLVM directory to root directory to satisfy - license checker. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - LICENSE.TXT | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 279 insertions(+) - create mode 100644 LICENSE.TXT - -diff --git a/LICENSE.TXT b/LICENSE.TXT -new file mode 100644 -index 000000000000..fa6ac5400070 ---- /dev/null -+++ b/LICENSE.TXT -@@ -0,0 +1,279 @@ -+============================================================================== -+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions: -+============================================================================== -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+ -+ -+---- LLVM Exceptions to the Apache 2.0 License ---- -+ -+As an exception, if, as a result of your compiling your source code, portions -+of this Software are embedded into an Object form of such source code, you -+may redistribute such embedded portions in such Object form without complying -+with the conditions of Sections 4(a), 4(b) and 4(d) of the License. -+ -+In addition, if you combine or link compiled forms of this Software with -+software that is licensed under the GPLv2 ("Combined Software") and if a -+court of competent jurisdiction determines that the patent provision (Section -+3), the indemnity provision (Section 9) or other Section of the License -+conflicts with the conditions of the GPLv2, you may retroactively and -+prospectively choose to deem waived or otherwise exclude such Section(s) of -+the License, but only in their entirety and only with respect to the Combined -+Software. -+ -+============================================================================== -+Software from third parties included in the LLVM Project: -+============================================================================== -+The LLVM Project contains third party software which is under different license -+terms. All such code will be identified clearly using at least one of two -+mechanisms: -+1) It will be in a separate directory tree with its own `LICENSE.txt` or -+ `LICENSE` file at the top containing the specific license and restrictions -+ which apply to that software, or -+2) It will contain specific license and restriction terms at the top of every -+ file. -+ -+============================================================================== -+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy): -+============================================================================== -+University of Illinois/NCSA -+Open Source License -+ -+Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign. -+All rights reserved. -+ -+Developed by: -+ -+ LLVM Team -+ -+ University of Illinois at Urbana-Champaign -+ -+ http://llvm.org -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal with -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+ * Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimers. -+ -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimers in the -+ documentation and/or other materials provided with the distribution. -+ -+ * Neither the names of the LLVM Team, University of Illinois at -+ Urbana-Champaign, nor the names of its contributors may be used to -+ endorse or promote products derived from this Software without specific -+ prior written permission. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -+SOFTWARE. -+ diff --git a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch b/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch deleted file mode 100644 index 02d7b7b61..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 11 Aug 2022 01:08:46 -0500 -Subject: [PATCH] Add SourceBuild.props. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - eng/SourceBuild.props | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 eng/SourceBuild.props - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -new file mode 100644 -index 000000000000..93e2809599f6 ---- /dev/null -+++ b/eng/SourceBuild.props -@@ -0,0 +1,8 @@ -+ -+ -+ -+ llvm-project -+ true -+ -+ -+ diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch deleted file mode 100644 index 4625e0e9a..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 25 Jul 2022 15:53:59 +0000 -Subject: [PATCH] Add CA2213 NoWarn - -Workaround until NuGet updates to build with latest .NET toolset. ---- - build/common.project.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 93287fdde..9d1fb3bce 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -52,7 +52,7 @@ - $(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll - $(NoWarn);NU5105;MSB3277 - -- $(NoWarn);CS1998;CA1416;CS0618;CS1574 -+ $(NoWarn);CS1998;CA1416;CS0618;CS1574;CA2213 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index d1ae9b05d..eec487f1b 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -15,7 +15,7 @@ This is taking the approach used in previous versions of source-build: update th Contributes to https://github.com/dotnet/source-build/issues/2420 Contributes to https://github.com/dotnet/source-build/issues/2527 -Backport: https://github.com/dotnet/source-build/issues/2708 +Backport: https://github.com/dotnet/source-build/issues/3049 --- eng/Versions.props | 14 -------------- src/Directory.Build.targets | 5 +++-- diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch new file mode 100644 index 000000000..02e49eec9 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 26 Sep 2022 14:25:33 -0500 +Subject: Remove LLVM ObjWriter dependency in source-build + +Backport PR: https://github.com/dotnet/runtime/pull/76206. + +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +index 8c4fce523906e..4fd1db03e8a48 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +@@ -48,12 +48,14 @@ + + + true ++ ++ true + + + + + +- ++ + $(ObjWriterVersion) + + +@@ -62,7 +64,7 @@ + $(NetStandardLibraryVersion) + + +- ++ + PreserveNewest + false + false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch index cf69f8b84..dd0d19c7a 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch @@ -3,8 +3,7 @@ From: Logan Bussell Date: Tue, 20 Sep 2022 10:10:29 -0700 Subject: [PATCH] Look for msbuild net7.0 artifacts -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. +Backport: https://github.com/dotnet/sdk/pull/28425 --- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index c7a7642e4..da7d186a1 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ - + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 275ec3a11..c9718bef9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +168,7 @@ linux-bionic-arm64; linux-bionic-x64; linux-bionic-x86; + linux-ppc64le; "/> - + + @@ -444,7 +447,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore70RuntimePackRids, '%3B')" RuntimePackExcludedRuntimeIdentifiers="android" /> @@ -569,7 +572,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet60TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')" /> Date: Mon, 14 Nov 2022 18:46:49 +0000 Subject: [PATCH 048/249] Update dependencies from https://github.com/dotnet/sdk build 20221114.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.22559.7 -> To Version 12.5.0-beta.22563.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4842389f5..e535d4cf3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d964c0132..9b18bc019 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba + 00a9aeed44d2fa57392df3e296115b563a2498c0 - + https://github.com/dotnet/sdk - 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba + 00a9aeed44d2fa57392df3e296115b563a2498c0 - + https://github.com/dotnet/sdk - 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba + 00a9aeed44d2fa57392df3e296115b563a2498c0 - + https://github.com/dotnet/sdk - 6dabdf4e2f6cbe5f97faf7ee6dc2c29bd89a67ba + 00a9aeed44d2fa57392df3e296115b563a2498c0 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 126877797a797eeb17ddfb8d18904c18eca8aa5d + 9f7329d4b4deab97603643eaa6607779d03568f1 - + https://github.com/dotnet/fsharp - 126877797a797eeb17ddfb8d18904c18eca8aa5d + 9f7329d4b4deab97603643eaa6607779d03568f1 @@ -153,9 +153,9 @@ 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 15b127d2445d6b68429f1c31d9ff98fe4e1e728c + d14b74d6f08ab7f2e17706359a38f8c22b569cb5 diff --git a/eng/Versions.props b/eng/Versions.props index 672c051f9..943e7009d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22563.2 - 8.0.100-alpha.1.22563.2 + 8.0.100-alpha.1.22564.7 + 8.0.100-alpha.1.22564.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bb3d0719eec7cd2e85584448c9e2f3daea03e9b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 14 Nov 2022 18:52:43 +0000 Subject: [PATCH 049/249] source-build fixup - patch should not flow as it was backported in main --- ...ObjWriter-dependency-in-source-build.patch | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false From cae0806c99dbd3176c04a070e233cbf392ad777d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 20:08:32 +0000 Subject: [PATCH 050/249] Update dependencies from https://github.com/dotnet/sdk build 20221114.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.22559.7 -> To Version 12.5.0-beta.22563.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e535d4cf3..e7459a51d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b18bc019..b74610ac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 00a9aeed44d2fa57392df3e296115b563a2498c0 + fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f - + https://github.com/dotnet/sdk - 00a9aeed44d2fa57392df3e296115b563a2498c0 + fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f - + https://github.com/dotnet/sdk - 00a9aeed44d2fa57392df3e296115b563a2498c0 + fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f - + https://github.com/dotnet/sdk - 00a9aeed44d2fa57392df3e296115b563a2498c0 + fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f @@ -142,9 +142,9 @@ b61973970a544ea30d03ac35b6f5535adb64fd4c - + https://github.com/dotnet/linker - 9c993bf401377209cd7b4e84b60deab5e4f421a2 + 13b8d6d68a07a47e52e13705313bc32d5540edf5 linker diff --git a/eng/Versions.props b/eng/Versions.props index 943e7009d..6e92591d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22564.7 - 8.0.100-alpha.1.22564.7 + 8.0.100-alpha.1.22564.10 + 8.0.100-alpha.1.22564.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 108b2a9686c500c680a17956827eb5f3fa60fdda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Nov 2022 13:33:12 +0000 Subject: [PATCH 051/249] Update dependencies from https://github.com/dotnet/sdk build 20221115.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7459a51d..e1233b721 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb3f18696..754688992 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + a95dd63b2f422489d8a72de8b83c741db9c5ffa6 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + a95dd63b2f422489d8a72de8b83c741db9c5ffa6 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + a95dd63b2f422489d8a72de8b83c741db9c5ffa6 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + a95dd63b2f422489d8a72de8b83c741db9c5ffa6 diff --git a/eng/Versions.props b/eng/Versions.props index b3428c715..a27995ff3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22564.10 - 8.0.100-alpha.1.22564.10 + 8.0.100-alpha.1.22565.1 + 8.0.100-alpha.1.22565.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 07c5dda4d3be283e4a27673155e1f6f00802ef07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Nov 2022 14:45:26 +0000 Subject: [PATCH 052/249] Update dependencies from https://github.com/dotnet/sdk build 20221115.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1233b721..d15292c11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 754688992..7195bea14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - a95dd63b2f422489d8a72de8b83c741db9c5ffa6 + b68de63954610d17b82166de586567dd244a85ca - + https://github.com/dotnet/sdk - a95dd63b2f422489d8a72de8b83c741db9c5ffa6 + b68de63954610d17b82166de586567dd244a85ca - + https://github.com/dotnet/sdk - a95dd63b2f422489d8a72de8b83c741db9c5ffa6 + b68de63954610d17b82166de586567dd244a85ca - + https://github.com/dotnet/sdk - a95dd63b2f422489d8a72de8b83c741db9c5ffa6 + b68de63954610d17b82166de586567dd244a85ca diff --git a/eng/Versions.props b/eng/Versions.props index a27995ff3..f30add04f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22565.1 - 8.0.100-alpha.1.22565.1 + 8.0.100-alpha.1.22565.3 + 8.0.100-alpha.1.22565.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4af3c9956792e285bc00a0ac32b7b077bfb5c4b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 15 Nov 2022 08:49:39 -0600 Subject: [PATCH 053/249] Remove RepoRoot normalization workaround (#14988) --- .../tarball/content/repos/Directory.Build.targets | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 7bf88fdd6..b7f1dfa9c 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -71,20 +71,6 @@ - - - - - Date: Tue, 15 Nov 2022 17:51:15 +0100 Subject: [PATCH 054/249] source-build: stop overriding aspnetcore version (#14938) * Rename MicrosoftAspNetCoreAppRuntimePackageVersion so existing Artifacts tarballs don't override it, and stop adding it to the PackageVersions.props in new Artifacts tarballs. * Patch PreviouslySourceBuiltPackageVersions. * PR feedback. --- .../tarball/content/Directory.Build.props | 4 ---- .../tarball/content/tools-local/init-build.proj | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index a1384a557..8880b5d05 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -223,12 +223,8 @@ - - - - diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index b2c3beed1..0405ad8f1 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + + + + + + Date: Tue, 15 Nov 2022 18:08:53 +0100 Subject: [PATCH 055/249] Add root `.gitignore` for the VMR (#14992) --- src/SourceBuild/tarball/content/.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/SourceBuild/tarball/content/.gitignore diff --git a/src/SourceBuild/tarball/content/.gitignore b/src/SourceBuild/tarball/content/.gitignore new file mode 100644 index 000000000..3d0d3589c --- /dev/null +++ b/src/SourceBuild/tarball/content/.gitignore @@ -0,0 +1,8 @@ +/.dotnet +/Tools +/artifacts +/packages +/tools-local/**/bin +/tools-local/**/obj +/src/linker/src/ILLink.Tasks/ILLink.Tasks.nuspec +/src/nuget-client/NuGet.config From c6348e5cd246aa0c996580cf85eef6ed167f7637 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Nov 2022 18:48:07 +0000 Subject: [PATCH 056/249] Update dependencies from https://github.com/dotnet/sdk build 20221115.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d15292c11..b44ca3729 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7195bea14..87c44e0a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - b68de63954610d17b82166de586567dd244a85ca + 0b02ef8bc58b74a17999fa06074c5940acebd893 - + https://github.com/dotnet/sdk - b68de63954610d17b82166de586567dd244a85ca + 0b02ef8bc58b74a17999fa06074c5940acebd893 - + https://github.com/dotnet/sdk - b68de63954610d17b82166de586567dd244a85ca + 0b02ef8bc58b74a17999fa06074c5940acebd893 - + https://github.com/dotnet/sdk - b68de63954610d17b82166de586567dd244a85ca + 0b02ef8bc58b74a17999fa06074c5940acebd893 diff --git a/eng/Versions.props b/eng/Versions.props index f30add04f..cfd33e688 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22565.3 - 8.0.100-alpha.1.22565.3 + 8.0.100-alpha.1.22565.7 + 8.0.100-alpha.1.22565.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c3a5538a175c64908b840c6207a7c20f7689436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 08:33:29 +0000 Subject: [PATCH 057/249] Update dependencies from https://github.com/dotnet/sdk build 20221115.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index b44ca3729..3ae34670f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87c44e0a4..dd45d1454 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 20c9952cbb6e9336991c1c38fa0753d67e5d181f https://github.com/dotnet/test-templates @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 0b02ef8bc58b74a17999fa06074c5940acebd893 + c60662262f9c0d1a5c49a157dff5e9441897b01d - + https://github.com/dotnet/sdk - 0b02ef8bc58b74a17999fa06074c5940acebd893 + c60662262f9c0d1a5c49a157dff5e9441897b01d - + https://github.com/dotnet/sdk - 0b02ef8bc58b74a17999fa06074c5940acebd893 + c60662262f9c0d1a5c49a157dff5e9441897b01d - + https://github.com/dotnet/sdk - 0b02ef8bc58b74a17999fa06074c5940acebd893 + c60662262f9c0d1a5c49a157dff5e9441897b01d diff --git a/eng/Versions.props b/eng/Versions.props index cfd33e688..59042d23d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,13 +54,13 @@ - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22565.10 0.2.0 @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22565.7 - 8.0.100-alpha.1.22565.7 + 8.0.100-alpha.1.22565.16 + 8.0.100-alpha.1.22565.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0da346aad15b05be0a63e0b9eaf3f471b18c69f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 12:23:11 +0000 Subject: [PATCH 058/249] Update dependencies from https://github.com/dotnet/sdk build 20221116.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ae34670f..ef559d42d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd45d1454..02a877447 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - c60662262f9c0d1a5c49a157dff5e9441897b01d + eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 - + https://github.com/dotnet/sdk - c60662262f9c0d1a5c49a157dff5e9441897b01d + eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 - + https://github.com/dotnet/sdk - c60662262f9c0d1a5c49a157dff5e9441897b01d + eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 - + https://github.com/dotnet/sdk - c60662262f9c0d1a5c49a157dff5e9441897b01d + eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 diff --git a/eng/Versions.props b/eng/Versions.props index 59042d23d..46c9dedc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22565.16 - 8.0.100-alpha.1.22565.16 + 8.0.100-alpha.1.22566.2 + 8.0.100-alpha.1.22566.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cec8e5a2d07dbb4b40ae9a6647466301a9ac96f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 21:22:04 +0000 Subject: [PATCH 059/249] Update dependencies from https://github.com/dotnet/sdk build 20221116.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef559d42d..769169036 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02a877447..333c2dfeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 + a2b462e1b6c126c0af21d458c71d80465145c235 - + https://github.com/dotnet/sdk - eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 + a2b462e1b6c126c0af21d458c71d80465145c235 - + https://github.com/dotnet/sdk - eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 + a2b462e1b6c126c0af21d458c71d80465145c235 - + https://github.com/dotnet/sdk - eae029a68bc845aeb5e02fd7b4354c3f795e2aa8 + a2b462e1b6c126c0af21d458c71d80465145c235 diff --git a/eng/Versions.props b/eng/Versions.props index 46c9dedc8..7bca4e853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22566.2 - 8.0.100-alpha.1.22566.2 + 8.0.100-alpha.1.22566.9 + 8.0.100-alpha.1.22566.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c23f34be7f695fb62230971157628ed1937f03d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 23:01:57 +0000 Subject: [PATCH 060/249] Update dependencies from https://github.com/dotnet/sdk build 20221116.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 769169036..209657ce8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 333c2dfeb..98e7086cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - a2b462e1b6c126c0af21d458c71d80465145c235 + 5741b101d69f7e44d84eb53a1513dbfa255565fa - + https://github.com/dotnet/sdk - a2b462e1b6c126c0af21d458c71d80465145c235 + 5741b101d69f7e44d84eb53a1513dbfa255565fa - + https://github.com/dotnet/sdk - a2b462e1b6c126c0af21d458c71d80465145c235 + 5741b101d69f7e44d84eb53a1513dbfa255565fa - + https://github.com/dotnet/sdk - a2b462e1b6c126c0af21d458c71d80465145c235 + 5741b101d69f7e44d84eb53a1513dbfa255565fa @@ -148,9 +148,9 @@ linker - + https://github.com/dotnet/roslyn - 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 + cc6062cd438899ac810b3766a05b8db636e70225 @@ -158,9 +158,9 @@ d14b74d6f08ab7f2e17706359a38f8c22b569cb5 - + https://github.com/nuget/nuget.client - ea921bf1871b2799d9c130aad860db33e6577975 + a487c8336b29a0e53dc46f4aab424fdd5de50e72 diff --git a/eng/Versions.props b/eng/Versions.props index 7bca4e853..be9a88336 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22566.9 - 8.0.100-alpha.1.22566.9 + 8.0.100-alpha.1.22566.12 + 8.0.100-alpha.1.22566.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a08d631ac785b65c8856e95082e8d7399373a5ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 23:54:00 +0000 Subject: [PATCH 061/249] Update dependencies from https://github.com/dotnet/sdk build 20221116.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 209657ce8..8f20bdc76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98e7086cc..158892cb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 5741b101d69f7e44d84eb53a1513dbfa255565fa + 840f68922344407b2da73311ab3d8aceea8d1ce2 - + https://github.com/dotnet/sdk - 5741b101d69f7e44d84eb53a1513dbfa255565fa + 840f68922344407b2da73311ab3d8aceea8d1ce2 - + https://github.com/dotnet/sdk - 5741b101d69f7e44d84eb53a1513dbfa255565fa + 840f68922344407b2da73311ab3d8aceea8d1ce2 - + https://github.com/dotnet/sdk - 5741b101d69f7e44d84eb53a1513dbfa255565fa + 840f68922344407b2da73311ab3d8aceea8d1ce2 diff --git a/eng/Versions.props b/eng/Versions.props index be9a88336..b65aec9a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22566.12 - 8.0.100-alpha.1.22566.12 + 8.0.100-alpha.1.22566.15 + 8.0.100-alpha.1.22566.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b504dab6429b7101d4cfa8bb1f69b815aa37e1c2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Nov 2022 16:43:16 -0600 Subject: [PATCH 062/249] Fix threading issue in source build smoke tests (#15009) --- .../ExecuteHelper.cs | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 62e1eb594..570b5accb 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -75,16 +75,30 @@ internal static class ExecuteHelper process.WaitForExit(); } - string output = stdOutput.ToString().Trim(); - if (logOutput && !string.IsNullOrWhiteSpace(output)) + string output; + string error; + + lock (stdOutput) { - outputHelper.WriteLine(output); + output = stdOutput.ToString().Trim(); } - string error = stdError.ToString().Trim(); - if (logOutput && !string.IsNullOrWhiteSpace(error)) + lock (stdError) { - outputHelper.WriteLine(error); + error = stdError.ToString().Trim(); + } + + if (logOutput) + { + if (!string.IsNullOrWhiteSpace(output)) + { + outputHelper.WriteLine(output); + } + + if (string.IsNullOrWhiteSpace(error)) + { + outputHelper.WriteLine(error); + } } return (process, output, error); From f70747656494b3f4915e0a52dfa2b025a46136ec Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 17 Nov 2022 15:41:04 -0800 Subject: [PATCH 063/249] Update asp.net templates (#14960) * Update asp.net templates * Update GenerateBundledVersions.targets * Update Versions.props --- eng/Versions.props | 8 ++++---- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b3428c715..3fb6360fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,8 +112,8 @@ 5.0.403 6.0.302 7.0.100 - 5.0.13 - 6.0.1 + 5.0.17 + 6.0.11 7.0.0 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 @@ -150,7 +150,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.10 + 6.0.11 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -165,7 +165,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 855a88489..8eb7054e6 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -61,9 +61,9 @@ 30 - 30 + 31 17 - 10 + 11 0 From 67803990bd3f60460afc6b157897dcdcf4e5d5bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 23:56:45 +0000 Subject: [PATCH 064/249] Update dependencies from https://github.com/dotnet/sdk build 20221118.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f20bdc76..025df93fe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 158892cb4..eec4198b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 840f68922344407b2da73311ab3d8aceea8d1ce2 + ac8b0e86a9628a3a02995cfa0f5a88114b317b7a - + https://github.com/dotnet/sdk - 840f68922344407b2da73311ab3d8aceea8d1ce2 + ac8b0e86a9628a3a02995cfa0f5a88114b317b7a - + https://github.com/dotnet/sdk - 840f68922344407b2da73311ab3d8aceea8d1ce2 + ac8b0e86a9628a3a02995cfa0f5a88114b317b7a - + https://github.com/dotnet/sdk - 840f68922344407b2da73311ab3d8aceea8d1ce2 + ac8b0e86a9628a3a02995cfa0f5a88114b317b7a diff --git a/eng/Versions.props b/eng/Versions.props index b65aec9a5..9115e3e4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22566.15 - 8.0.100-alpha.1.22566.15 + 8.0.100-alpha.1.22568.17 + 8.0.100-alpha.1.22568.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c79a8a19f796e9294809b275495140485aa11e42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 01:08:51 +0000 Subject: [PATCH 065/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22557.1 -> To Version 8.0.0-alpha.1.22560.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb3f18696..89a1e6293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 4957077bf92bf720b0619fdf706be132e3b42a07 + b3feaafe4f85854f5b3a8ade64d82e27e1390378 From d1475c4b51c680e1ed685d4670ca7f1ef39a310f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 02:20:30 +0000 Subject: [PATCH 066/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221115.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22557.1 -> To Version 8.0.0-alpha.1.22565.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89a1e6293..960744202 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b3feaafe4f85854f5b3a8ade64d82e27e1390378 + a023ffe86a62cd363cf0d1c61f9fc55c015f8f3e From e1fe855f529b150ac7f5f5c9e1402c4bc4a291be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 04:24:45 +0000 Subject: [PATCH 067/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221110.1 (#15019) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb3f18696..f8ac9a9fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4d37f75b11b8613594fcb38bd9b965a75877c49f + d6993c3296c6b25dbe62fef14e3ed7f3dcbb5f34 From d001537d98b90f63417cd131912bdac8047c0be8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 12:26:46 +0000 Subject: [PATCH 068/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 025df93fe..3326bf94b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eec4198b7..1789c01a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - ac8b0e86a9628a3a02995cfa0f5a88114b317b7a + cba19e6b301b13471f1f8fd74d3637ca5a8d978d - + https://github.com/dotnet/sdk - ac8b0e86a9628a3a02995cfa0f5a88114b317b7a + cba19e6b301b13471f1f8fd74d3637ca5a8d978d - + https://github.com/dotnet/sdk - ac8b0e86a9628a3a02995cfa0f5a88114b317b7a + cba19e6b301b13471f1f8fd74d3637ca5a8d978d - + https://github.com/dotnet/sdk - ac8b0e86a9628a3a02995cfa0f5a88114b317b7a + cba19e6b301b13471f1f8fd74d3637ca5a8d978d diff --git a/eng/Versions.props b/eng/Versions.props index 9115e3e4a..07505eeb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 8.0.100 - 8.0.100-alpha.1.22568.17 - 8.0.100-alpha.1.22568.17 + 8.0.100-alpha.1.22571.1 + 8.0.100-alpha.1.22571.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5b732dfd99afb19913733ca3e9b117dd55d6b4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 13:53:58 +0000 Subject: [PATCH 069/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3326bf94b..08a242e88 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1789c01a9..be4cf291c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - cba19e6b301b13471f1f8fd74d3637ca5a8d978d + 2b804b83172289bff29c4bd945794573de2bba01 - + https://github.com/dotnet/sdk - cba19e6b301b13471f1f8fd74d3637ca5a8d978d + 2b804b83172289bff29c4bd945794573de2bba01 - + https://github.com/dotnet/sdk - cba19e6b301b13471f1f8fd74d3637ca5a8d978d + 2b804b83172289bff29c4bd945794573de2bba01 - + https://github.com/dotnet/sdk - cba19e6b301b13471f1f8fd74d3637ca5a8d978d + 2b804b83172289bff29c4bd945794573de2bba01 diff --git a/eng/Versions.props b/eng/Versions.props index 07505eeb2..6ecdde836 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100 - 8.0.100-alpha.1.22571.1 - 8.0.100-alpha.1.22571.1 + 8.0.100-alpha.1.22571.2 + 8.0.100-alpha.1.22571.2 + 8.0.100-alpha.1.22571.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4c400586989b61476f061db67c0dce79e0e0350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 14:46:16 +0000 Subject: [PATCH 070/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22565.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be4cf291c..fbe0ebcc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2b804b83172289bff29c4bd945794573de2bba01 + bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c - + https://github.com/dotnet/sdk - 2b804b83172289bff29c4bd945794573de2bba01 + bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c - + https://github.com/dotnet/sdk - 2b804b83172289bff29c4bd945794573de2bba01 + bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c - + https://github.com/dotnet/sdk - 2b804b83172289bff29c4bd945794573de2bba01 + bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c diff --git a/eng/Versions.props b/eng/Versions.props index 6ecdde836..99d10d0ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22571.2 - 8.0.100-alpha.1.22571.2 - 8.0.100-alpha.1.22571.2 + 8.0.100-alpha.1.22571.3 + 8.0.100-alpha.1.22571.3 + 8.0.100-alpha.1.22571.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e1a50dae8c2580785f786593b3449c8f022096d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 15:46:40 +0000 Subject: [PATCH 071/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.4 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22558.5 -> To Version 8.0.0-alpha.1.22571.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbe0ebcc6..a52a010ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 - + https://github.com/dotnet/aspnetcore - 20c9952cbb6e9336991c1c38fa0753d67e5d181f + 5666c0e0ff45a66b63c872a947ac88cd870da976 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c + c68b3f63149883d6004364849f6b2127f4c3acc6 - + https://github.com/dotnet/sdk - bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c + c68b3f63149883d6004364849f6b2127f4c3acc6 - + https://github.com/dotnet/sdk - bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c + c68b3f63149883d6004364849f6b2127f4c3acc6 - + https://github.com/dotnet/sdk - bb61c2ee95a6b938fa8ad92363a32f9f3ebe2d8c + c68b3f63149883d6004364849f6b2127f4c3acc6 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + 728f809b2bcbd0b1a944c0daef4306d250830195 - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + 728f809b2bcbd0b1a944c0daef4306d250830195 diff --git a/eng/Versions.props b/eng/Versions.props index 99d10d0ad..f77553ed7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 - 8.0.0-alpha.1.22565.10 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.5 0.2.0 - 8.0.100-alpha.1.22571.3 - 8.0.100-alpha.1.22571.3 - 8.0.100-alpha.1.22571.3 + 8.0.100-alpha.1.22571.4 + 8.0.100-alpha.1.22571.4 + 8.0.100-alpha.1.22571.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cc05a1dbade82408d42698db719634c83df2da28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 16:45:22 +0000 Subject: [PATCH 072/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a52a010ce..b9ec2b40f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 9129083c2fc6ef32479168f0555875b54aee4dfb https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c68b3f63149883d6004364849f6b2127f4c3acc6 + fadc48d95aca44d37bb604b8b3065920b62da3e7 - + https://github.com/dotnet/sdk - c68b3f63149883d6004364849f6b2127f4c3acc6 + fadc48d95aca44d37bb604b8b3065920b62da3e7 - + https://github.com/dotnet/sdk - c68b3f63149883d6004364849f6b2127f4c3acc6 + fadc48d95aca44d37bb604b8b3065920b62da3e7 - + https://github.com/dotnet/sdk - c68b3f63149883d6004364849f6b2127f4c3acc6 + fadc48d95aca44d37bb604b8b3065920b62da3e7 @@ -148,9 +148,9 @@ linker - + https://github.com/dotnet/roslyn - cc6062cd438899ac810b3766a05b8db636e70225 + dc70a1ae8302b2407ff95b111bec759f7ba89cdc @@ -158,9 +158,9 @@ d14b74d6f08ab7f2e17706359a38f8c22b569cb5 - + https://github.com/nuget/nuget.client - a487c8336b29a0e53dc46f4aab424fdd5de50e72 + 340d447dfc6eaa0cb5d8c25df69fe7f235e37d62 diff --git a/eng/Versions.props b/eng/Versions.props index f77553ed7..2863bbdcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22571.4 - 8.0.100-alpha.1.22571.4 - 8.0.100-alpha.1.22571.4 + 8.0.100-alpha.1.22571.5 + 8.0.100-alpha.1.22571.5 + 8.0.100-alpha.1.22571.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22570.4 2.1.0 From f98ac34ed8249b63c3fbb7347930d1cf1b34f918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 17:30:35 +0000 Subject: [PATCH 073/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.6 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9ec2b40f..fc39e61b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fadc48d95aca44d37bb604b8b3065920b62da3e7 + 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 - + https://github.com/dotnet/sdk - fadc48d95aca44d37bb604b8b3065920b62da3e7 + 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 - + https://github.com/dotnet/sdk - fadc48d95aca44d37bb604b8b3065920b62da3e7 + 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 - + https://github.com/dotnet/sdk - fadc48d95aca44d37bb604b8b3065920b62da3e7 + 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 @@ -153,9 +153,9 @@ dc70a1ae8302b2407ff95b111bec759f7ba89cdc - + https://github.com/dotnet/msbuild - d14b74d6f08ab7f2e17706359a38f8c22b569cb5 + 7037436dc4d2038407c8592b9e256f0cf777f20c diff --git a/eng/Versions.props b/eng/Versions.props index 2863bbdcf..47b1055a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22571.5 - 8.0.100-alpha.1.22571.5 - 8.0.100-alpha.1.22571.5 + 8.0.100-alpha.1.22571.6 + 8.0.100-alpha.1.22571.6 + 8.0.100-alpha.1.22571.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d605c98eb2a8c9b98442f925c53fe0b0196b074 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 18:19:29 +0000 Subject: [PATCH 074/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.7 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc39e61b8..081d7cce9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 + 7d3641685d4e4522881e68ee698852620f155975 - + https://github.com/dotnet/sdk - 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 + 7d3641685d4e4522881e68ee698852620f155975 - + https://github.com/dotnet/sdk - 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 + 7d3641685d4e4522881e68ee698852620f155975 - + https://github.com/dotnet/sdk - 0cae939dad4a5b2db60cd31daaf893e0a6d688b7 + 7d3641685d4e4522881e68ee698852620f155975 @@ -142,9 +142,9 @@ b61973970a544ea30d03ac35b6f5535adb64fd4c - + https://github.com/dotnet/linker - 13b8d6d68a07a47e52e13705313bc32d5540edf5 + 2172c795f264aa518b56dd84c1b75d853c5dcc88 linker diff --git a/eng/Versions.props b/eng/Versions.props index 47b1055a3..22f9524e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22571.6 - 8.0.100-alpha.1.22571.6 - 8.0.100-alpha.1.22571.6 + 8.0.100-alpha.1.22571.7 + 8.0.100-alpha.1.22571.7 + 8.0.100-alpha.1.22571.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 843674f75685c74fe8686347242f540a90a50f7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 19:10:59 +0000 Subject: [PATCH 075/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081d7cce9..af4d6a192 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 - + https://github.com/dotnet/aspnetcore - 5666c0e0ff45a66b63c872a947ac88cd870da976 + 1549377232cb2ed3f7e92b5b09a7b21445536bb7 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7d3641685d4e4522881e68ee698852620f155975 + 2cda88903234b8753387874f8edb5d7dd2a7556a - + https://github.com/dotnet/sdk - 7d3641685d4e4522881e68ee698852620f155975 + 2cda88903234b8753387874f8edb5d7dd2a7556a - + https://github.com/dotnet/sdk - 7d3641685d4e4522881e68ee698852620f155975 + 2cda88903234b8753387874f8edb5d7dd2a7556a - + https://github.com/dotnet/sdk - 7d3641685d4e4522881e68ee698852620f155975 + 2cda88903234b8753387874f8edb5d7dd2a7556a diff --git a/eng/Versions.props b/eng/Versions.props index 22f9524e1..0c3d2d531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 - 8.0.0-alpha.1.22571.5 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 0.2.0 - 8.0.100-alpha.1.22571.7 - 8.0.100-alpha.1.22571.7 - 8.0.100-alpha.1.22571.7 + 8.0.100-alpha.1.22571.8 + 8.0.100-alpha.1.22571.8 + 8.0.100-alpha.1.22571.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 695605206c5e82efa1bf72a703116d8169ea9a95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 20:00:11 +0000 Subject: [PATCH 076/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af4d6a192..276be1710 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2cda88903234b8753387874f8edb5d7dd2a7556a + 961db0cc0870e64f362609437a319d80a5570e42 - + https://github.com/dotnet/sdk - 2cda88903234b8753387874f8edb5d7dd2a7556a + 961db0cc0870e64f362609437a319d80a5570e42 - + https://github.com/dotnet/sdk - 2cda88903234b8753387874f8edb5d7dd2a7556a + 961db0cc0870e64f362609437a319d80a5570e42 - + https://github.com/dotnet/sdk - 2cda88903234b8753387874f8edb5d7dd2a7556a + 961db0cc0870e64f362609437a319d80a5570e42 diff --git a/eng/Versions.props b/eng/Versions.props index 0c3d2d531..654ee0dec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22571.8 - 8.0.100-alpha.1.22571.8 - 8.0.100-alpha.1.22571.8 + 8.0.100-alpha.1.22571.14 + 8.0.100-alpha.1.22571.14 + 8.0.100-alpha.1.22571.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b24ca13f7b676156e1ee760dd979034db59b4761 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 05:25:57 +0000 Subject: [PATCH 077/249] Update dependencies from https://github.com/dotnet/sdk build 20221121.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22571.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 276be1710..63f1ef0a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 961db0cc0870e64f362609437a319d80a5570e42 + d9e64fb67a7dde6fa68352829496114c02a187cd - + https://github.com/dotnet/sdk - 961db0cc0870e64f362609437a319d80a5570e42 + d9e64fb67a7dde6fa68352829496114c02a187cd - + https://github.com/dotnet/sdk - 961db0cc0870e64f362609437a319d80a5570e42 + d9e64fb67a7dde6fa68352829496114c02a187cd - + https://github.com/dotnet/sdk - 961db0cc0870e64f362609437a319d80a5570e42 + d9e64fb67a7dde6fa68352829496114c02a187cd diff --git a/eng/Versions.props b/eng/Versions.props index 654ee0dec..878229c1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22571.14 - 8.0.100-alpha.1.22571.14 - 8.0.100-alpha.1.22571.14 + 8.0.100-alpha.1.22571.20 + 8.0.100-alpha.1.22571.20 + 8.0.100-alpha.1.22571.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70f4176cf8cdc87fa547ecc23d04915aa8c49653 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 09:15:15 +0000 Subject: [PATCH 078/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63f1ef0a3..c3eebf8a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c - + https://github.com/dotnet/aspnetcore - 1549377232cb2ed3f7e92b5b09a7b21445536bb7 + 563c42ee0e784ab6ba14b8d6675cd0530c2b901c https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d9e64fb67a7dde6fa68352829496114c02a187cd + 67b38bd7ce4d3c36d7854274c490a98de48174e2 - + https://github.com/dotnet/sdk - d9e64fb67a7dde6fa68352829496114c02a187cd + 67b38bd7ce4d3c36d7854274c490a98de48174e2 - + https://github.com/dotnet/sdk - d9e64fb67a7dde6fa68352829496114c02a187cd + 67b38bd7ce4d3c36d7854274c490a98de48174e2 - + https://github.com/dotnet/sdk - d9e64fb67a7dde6fa68352829496114c02a187cd + 67b38bd7ce4d3c36d7854274c490a98de48174e2 diff --git a/eng/Versions.props b/eng/Versions.props index 878229c1f..f5b8e48ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22571.13 0.2.0 - 8.0.100-alpha.1.22571.20 - 8.0.100-alpha.1.22571.20 - 8.0.100-alpha.1.22571.20 + 8.0.100-alpha.1.22572.2 + 8.0.100-alpha.1.22572.2 + 8.0.100-alpha.1.22572.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0c96bb7df239f1789433470fe21853be8b07d00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 10:27:15 +0000 Subject: [PATCH 079/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3eebf8a4..d28a96b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 67b38bd7ce4d3c36d7854274c490a98de48174e2 + e8a2d9d961bf044e7bae1e4e899bb209407481ec - + https://github.com/dotnet/sdk - 67b38bd7ce4d3c36d7854274c490a98de48174e2 + e8a2d9d961bf044e7bae1e4e899bb209407481ec - + https://github.com/dotnet/sdk - 67b38bd7ce4d3c36d7854274c490a98de48174e2 + e8a2d9d961bf044e7bae1e4e899bb209407481ec - + https://github.com/dotnet/sdk - 67b38bd7ce4d3c36d7854274c490a98de48174e2 + e8a2d9d961bf044e7bae1e4e899bb209407481ec @@ -148,9 +148,9 @@ linker - + https://github.com/dotnet/roslyn - dc70a1ae8302b2407ff95b111bec759f7ba89cdc + 2e846c4211610644773577d2aec8c584ae9412ff diff --git a/eng/Versions.props b/eng/Versions.props index f5b8e48ae..2757ed647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22572.2 - 8.0.100-alpha.1.22572.2 - 8.0.100-alpha.1.22572.2 + 8.0.100-alpha.1.22572.3 + 8.0.100-alpha.1.22572.3 + 8.0.100-alpha.1.22572.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b30dc156197340aaa166bfbce75a85d61756df1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 13:22:28 +0000 Subject: [PATCH 080/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d28a96b54..442f5b4ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e8a2d9d961bf044e7bae1e4e899bb209407481ec + e97daa0cc787838b2d4ac1ab7191cd7fecd70efe - + https://github.com/dotnet/sdk - e8a2d9d961bf044e7bae1e4e899bb209407481ec + e97daa0cc787838b2d4ac1ab7191cd7fecd70efe - + https://github.com/dotnet/sdk - e8a2d9d961bf044e7bae1e4e899bb209407481ec + e97daa0cc787838b2d4ac1ab7191cd7fecd70efe - + https://github.com/dotnet/sdk - e8a2d9d961bf044e7bae1e4e899bb209407481ec + e97daa0cc787838b2d4ac1ab7191cd7fecd70efe @@ -142,9 +142,9 @@ b61973970a544ea30d03ac35b6f5535adb64fd4c - + https://github.com/dotnet/linker - 2172c795f264aa518b56dd84c1b75d853c5dcc88 + e775974b93ac5c1430fe644b93dfa877c7661b1d linker diff --git a/eng/Versions.props b/eng/Versions.props index 2757ed647..8f33b8a40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22572.3 - 8.0.100-alpha.1.22572.3 - 8.0.100-alpha.1.22572.3 + 8.0.100-alpha.1.22572.5 + 8.0.100-alpha.1.22572.5 + 8.0.100-alpha.1.22572.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9907c1eb3b4a6960223d657ef18f1e1bf22cacab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 16:30:21 +0000 Subject: [PATCH 081/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.6 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 442f5b4ea..77bd5892b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e97daa0cc787838b2d4ac1ab7191cd7fecd70efe + 7e5fad75e5396356cd5492b94532c7dd67c419a8 - + https://github.com/dotnet/sdk - e97daa0cc787838b2d4ac1ab7191cd7fecd70efe + 7e5fad75e5396356cd5492b94532c7dd67c419a8 - + https://github.com/dotnet/sdk - e97daa0cc787838b2d4ac1ab7191cd7fecd70efe + 7e5fad75e5396356cd5492b94532c7dd67c419a8 - + https://github.com/dotnet/sdk - e97daa0cc787838b2d4ac1ab7191cd7fecd70efe + 7e5fad75e5396356cd5492b94532c7dd67c419a8 diff --git a/eng/Versions.props b/eng/Versions.props index 8f33b8a40..d27faae76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22572.5 - 8.0.100-alpha.1.22572.5 - 8.0.100-alpha.1.22572.5 + 8.0.100-alpha.1.22572.6 + 8.0.100-alpha.1.22572.6 + 8.0.100-alpha.1.22572.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d29ecfc71bcb803d8e939f9cd81bfc2e6035625 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 18:27:54 +0000 Subject: [PATCH 082/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77bd5892b..b38303fb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7e5fad75e5396356cd5492b94532c7dd67c419a8 + a342ab0ab1cefa240915c978896b8dae34784c08 - + https://github.com/dotnet/sdk - 7e5fad75e5396356cd5492b94532c7dd67c419a8 + a342ab0ab1cefa240915c978896b8dae34784c08 - + https://github.com/dotnet/sdk - 7e5fad75e5396356cd5492b94532c7dd67c419a8 + a342ab0ab1cefa240915c978896b8dae34784c08 - + https://github.com/dotnet/sdk - 7e5fad75e5396356cd5492b94532c7dd67c419a8 + a342ab0ab1cefa240915c978896b8dae34784c08 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 728f809b2bcbd0b1a944c0daef4306d250830195 + b714b84012aab3b682f6069c8c8780a5f2043dc7 - + https://github.com/dotnet/fsharp - 728f809b2bcbd0b1a944c0daef4306d250830195 + b714b84012aab3b682f6069c8c8780a5f2043dc7 @@ -142,9 +142,9 @@ b61973970a544ea30d03ac35b6f5535adb64fd4c - + https://github.com/dotnet/linker - e775974b93ac5c1430fe644b93dfa877c7661b1d + 659f2b6a6bbbe41ab6366ac6a06bf86af2ec56cd linker diff --git a/eng/Versions.props b/eng/Versions.props index d27faae76..9698b4c51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22572.6 - 8.0.100-alpha.1.22572.6 - 8.0.100-alpha.1.22572.6 + 8.0.100-alpha.1.22572.14 + 8.0.100-alpha.1.22572.14 + 8.0.100-alpha.1.22572.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cfbceda1b34795a1339bddd247324ee8a1943e21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 19:27:00 +0000 Subject: [PATCH 083/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.15 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22570.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b38303fb4..a715a80fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 9129083c2fc6ef32479168f0555875b54aee4dfb - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 - + https://github.com/dotnet/aspnetcore - 563c42ee0e784ab6ba14b8d6675cd0530c2b901c + 2e94b96499b54342bd0edf7c849772d8a5513da6 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a342ab0ab1cefa240915c978896b8dae34784c08 + 77bba10ac9cacaed2af96cba4cd42c74f808baf7 - + https://github.com/dotnet/sdk - a342ab0ab1cefa240915c978896b8dae34784c08 + 77bba10ac9cacaed2af96cba4cd42c74f808baf7 - + https://github.com/dotnet/sdk - a342ab0ab1cefa240915c978896b8dae34784c08 + 77bba10ac9cacaed2af96cba4cd42c74f808baf7 - + https://github.com/dotnet/sdk - a342ab0ab1cefa240915c978896b8dae34784c08 + 77bba10ac9cacaed2af96cba4cd42c74f808baf7 diff --git a/eng/Versions.props b/eng/Versions.props index 9698b4c51..eefc150c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 - 8.0.0-alpha.1.22571.13 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.1 0.2.0 - 8.0.100-alpha.1.22572.14 - 8.0.100-alpha.1.22572.14 - 8.0.100-alpha.1.22572.14 + 8.0.100-alpha.1.22572.15 + 8.0.100-alpha.1.22572.15 + 8.0.100-alpha.1.22572.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b0b30945bcc5ffc4c57b7e50134328de45148a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 20:19:36 +0000 Subject: [PATCH 084/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.17 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a715a80fd..b09757e63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9129083c2fc6ef32479168f0555875b54aee4dfb + dd0ec9471dde6b6740ae6d9b504b64dec190b438 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 77bba10ac9cacaed2af96cba4cd42c74f808baf7 + 5699af5bb90e89f389cf25f1126bef74e44379da - + https://github.com/dotnet/sdk - 77bba10ac9cacaed2af96cba4cd42c74f808baf7 + 5699af5bb90e89f389cf25f1126bef74e44379da - + https://github.com/dotnet/sdk - 77bba10ac9cacaed2af96cba4cd42c74f808baf7 + 5699af5bb90e89f389cf25f1126bef74e44379da - + https://github.com/dotnet/sdk - 77bba10ac9cacaed2af96cba4cd42c74f808baf7 + 5699af5bb90e89f389cf25f1126bef74e44379da @@ -137,9 +137,9 @@ b714b84012aab3b682f6069c8c8780a5f2043dc7 - + https://github.com/microsoft/vstest - b61973970a544ea30d03ac35b6f5535adb64fd4c + 0a8ba241d27fcf4f7123b607423025417041f90d @@ -153,9 +153,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - 7037436dc4d2038407c8592b9e256f0cf777f20c + 0ac748cca1b976fc51aab7908446800c34f48b02 diff --git a/eng/Versions.props b/eng/Versions.props index eefc150c8..3b653c32e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22572.15 - 8.0.100-alpha.1.22572.15 - 8.0.100-alpha.1.22572.15 + 8.0.100-alpha.1.22572.17 + 8.0.100-alpha.1.22572.17 + 8.0.100-alpha.1.22572.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22570.4 - 8.0.0-alpha.1.22570.4 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22571.7 2.1.0 @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221111-01 + 17.5.0-preview-20221121-03 8.0.0-alpha.1.22557.12 From 4af4ee6aaf8ffbc038fe6f498f93527ac1238904 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 22:43:08 +0000 Subject: [PATCH 085/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.21 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09757e63..d7bbd616e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 - + https://github.com/dotnet/aspnetcore - 2e94b96499b54342bd0edf7c849772d8a5513da6 + 37c338e278a5c726a3b888c36e54e9c8527fda87 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5699af5bb90e89f389cf25f1126bef74e44379da + 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d - + https://github.com/dotnet/sdk - 5699af5bb90e89f389cf25f1126bef74e44379da + 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d - + https://github.com/dotnet/sdk - 5699af5bb90e89f389cf25f1126bef74e44379da + 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d - + https://github.com/dotnet/sdk - 5699af5bb90e89f389cf25f1126bef74e44379da + 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d diff --git a/eng/Versions.props b/eng/Versions.props index 3b653c32e..348d5f2df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 - 8.0.0-alpha.1.22572.1 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.2 0.2.0 - 8.0.100-alpha.1.22572.17 - 8.0.100-alpha.1.22572.17 - 8.0.100-alpha.1.22572.17 + 8.0.100-alpha.1.22572.21 + 8.0.100-alpha.1.22572.21 + 8.0.100-alpha.1.22572.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4879e6c70453bcb089e5aed46d58e67c8e01d0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 01:17:42 +0000 Subject: [PATCH 086/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.24 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7bbd616e..e14439a29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 - + https://github.com/dotnet/aspnetcore - 37c338e278a5c726a3b888c36e54e9c8527fda87 + fddab79bc470a125618b15ce2ef1e22764c9f1b0 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d + b450867cc7ce35e3f2605b4f8f55d874ceef2423 - + https://github.com/dotnet/sdk - 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d + b450867cc7ce35e3f2605b4f8f55d874ceef2423 - + https://github.com/dotnet/sdk - 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d + b450867cc7ce35e3f2605b4f8f55d874ceef2423 - + https://github.com/dotnet/sdk - 1c84e6d539f3b3e7f82c43b398da32bf0e7a467d + b450867cc7ce35e3f2605b4f8f55d874ceef2423 diff --git a/eng/Versions.props b/eng/Versions.props index 348d5f2df..1086eeb23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 - 8.0.0-alpha.1.22572.2 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.3 0.2.0 - 8.0.100-alpha.1.22572.21 - 8.0.100-alpha.1.22572.21 - 8.0.100-alpha.1.22572.21 + 8.0.100-alpha.1.22572.24 + 8.0.100-alpha.1.22572.24 + 8.0.100-alpha.1.22572.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d680b120e5a3f7e0e4b93742e5086cb0953ca9ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 03:51:54 +0000 Subject: [PATCH 087/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.25 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e14439a29..358fc49b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 - + https://github.com/dotnet/aspnetcore - fddab79bc470a125618b15ce2ef1e22764c9f1b0 + a3a37ce45e32fb20b1f9bbd3add21832df905879 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b450867cc7ce35e3f2605b4f8f55d874ceef2423 + 1a4445580b640f776756974bcc49ab4220a51b71 - + https://github.com/dotnet/sdk - b450867cc7ce35e3f2605b4f8f55d874ceef2423 + 1a4445580b640f776756974bcc49ab4220a51b71 - + https://github.com/dotnet/sdk - b450867cc7ce35e3f2605b4f8f55d874ceef2423 + 1a4445580b640f776756974bcc49ab4220a51b71 - + https://github.com/dotnet/sdk - b450867cc7ce35e3f2605b4f8f55d874ceef2423 + 1a4445580b640f776756974bcc49ab4220a51b71 diff --git a/eng/Versions.props b/eng/Versions.props index 1086eeb23..2a7270126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 - 8.0.0-alpha.1.22572.3 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.4 0.2.0 - 8.0.100-alpha.1.22572.24 - 8.0.100-alpha.1.22572.24 - 8.0.100-alpha.1.22572.24 + 8.0.100-alpha.1.22572.25 + 8.0.100-alpha.1.22572.25 + 8.0.100-alpha.1.22572.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 377a52ece68e129da6d79e627e63a454f21f6bef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 08:37:09 +0000 Subject: [PATCH 088/249] Update dependencies from https://github.com/dotnet/sdk build 20221122.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22572.29 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 358fc49b2..f9d647937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime dd0ec9471dde6b6740ae6d9b504b64dec190b438 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 - + https://github.com/dotnet/aspnetcore - a3a37ce45e32fb20b1f9bbd3add21832df905879 + 93997b79e2531c1894119e9a63644875c82fc655 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1a4445580b640f776756974bcc49ab4220a51b71 + 50aa3c739e14d2990c7eddda60954ef4a80e48f5 - + https://github.com/dotnet/sdk - 1a4445580b640f776756974bcc49ab4220a51b71 + 50aa3c739e14d2990c7eddda60954ef4a80e48f5 - + https://github.com/dotnet/sdk - 1a4445580b640f776756974bcc49ab4220a51b71 + 50aa3c739e14d2990c7eddda60954ef4a80e48f5 - + https://github.com/dotnet/sdk - 1a4445580b640f776756974bcc49ab4220a51b71 + 50aa3c739e14d2990c7eddda60954ef4a80e48f5 @@ -158,9 +158,9 @@ 0ac748cca1b976fc51aab7908446800c34f48b02 - + https://github.com/nuget/nuget.client - 340d447dfc6eaa0cb5d8c25df69fe7f235e37d62 + fd6441e3b421c07609a2db1abcf2ce844168dfe8 diff --git a/eng/Versions.props b/eng/Versions.props index 2a7270126..04fad3f5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 - 8.0.0-alpha.1.22572.4 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22572.5 0.2.0 - 8.0.100-alpha.1.22572.25 - 8.0.100-alpha.1.22572.25 - 8.0.100-alpha.1.22572.25 + 8.0.100-alpha.1.22572.29 + 8.0.100-alpha.1.22572.29 + 8.0.100-alpha.1.22572.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 30455be37c434c0b94fc81adb3b1109e7cd1d4f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 16:48:15 +0000 Subject: [PATCH 089/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9d647937..3103e8948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 50aa3c739e14d2990c7eddda60954ef4a80e48f5 + fcc8700e8ecf535b8f38d324718703134fc08b2c - + https://github.com/dotnet/sdk - 50aa3c739e14d2990c7eddda60954ef4a80e48f5 + fcc8700e8ecf535b8f38d324718703134fc08b2c - + https://github.com/dotnet/sdk - 50aa3c739e14d2990c7eddda60954ef4a80e48f5 + fcc8700e8ecf535b8f38d324718703134fc08b2c - + https://github.com/dotnet/sdk - 50aa3c739e14d2990c7eddda60954ef4a80e48f5 + fcc8700e8ecf535b8f38d324718703134fc08b2c @@ -137,9 +137,9 @@ b714b84012aab3b682f6069c8c8780a5f2043dc7 - + https://github.com/microsoft/vstest - 0a8ba241d27fcf4f7123b607423025417041f90d + f098763b32f8217d9d608ee2d690a0640d833cf3 diff --git a/eng/Versions.props b/eng/Versions.props index 04fad3f5c..7127dd925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22572.29 - 8.0.100-alpha.1.22572.29 - 8.0.100-alpha.1.22572.29 + 8.0.100-alpha.1.22573.2 + 8.0.100-alpha.1.22573.2 + 8.0.100-alpha.1.22573.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221121-03 + 17.5.0-preview-20221122-02 8.0.0-alpha.1.22557.12 From 95498b7b474fa17ecfb44c618cdab4c0360a0af8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 18:21:21 +0000 Subject: [PATCH 090/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22571.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3103e8948..0a4fedb59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fcc8700e8ecf535b8f38d324718703134fc08b2c + ff1a0636ade3f2f02a41297ea65d4e12177196bd - + https://github.com/dotnet/sdk - fcc8700e8ecf535b8f38d324718703134fc08b2c + ff1a0636ade3f2f02a41297ea65d4e12177196bd - + https://github.com/dotnet/sdk - fcc8700e8ecf535b8f38d324718703134fc08b2c + ff1a0636ade3f2f02a41297ea65d4e12177196bd - + https://github.com/dotnet/sdk - fcc8700e8ecf535b8f38d324718703134fc08b2c + ff1a0636ade3f2f02a41297ea65d4e12177196bd diff --git a/eng/Versions.props b/eng/Versions.props index 7127dd925..3a1d30946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22573.2 - 8.0.100-alpha.1.22573.2 - 8.0.100-alpha.1.22573.2 + 8.0.100-alpha.1.22573.3 + 8.0.100-alpha.1.22573.3 + 8.0.100-alpha.1.22573.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d1876bcd94c3d7a6d6bfccbc57505809aeee2b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 19:21:12 +0000 Subject: [PATCH 091/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a4fedb59..422f1f542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - dd0ec9471dde6b6740ae6d9b504b64dec190b438 + ce06592c8277d78299e60a634b4431f68c5834b6 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ff1a0636ade3f2f02a41297ea65d4e12177196bd + cd0cd2fb676760f567c9eabe16e352ebd876ca46 - + https://github.com/dotnet/sdk - ff1a0636ade3f2f02a41297ea65d4e12177196bd + cd0cd2fb676760f567c9eabe16e352ebd876ca46 - + https://github.com/dotnet/sdk - ff1a0636ade3f2f02a41297ea65d4e12177196bd + cd0cd2fb676760f567c9eabe16e352ebd876ca46 - + https://github.com/dotnet/sdk - ff1a0636ade3f2f02a41297ea65d4e12177196bd + cd0cd2fb676760f567c9eabe16e352ebd876ca46 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - b714b84012aab3b682f6069c8c8780a5f2043dc7 + ffb3909124177abf1907ba725969849841c94725 - + https://github.com/dotnet/fsharp - b714b84012aab3b682f6069c8c8780a5f2043dc7 + ffb3909124177abf1907ba725969849841c94725 diff --git a/eng/Versions.props b/eng/Versions.props index 3a1d30946..a8d7565c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22573.3 - 8.0.100-alpha.1.22573.3 - 8.0.100-alpha.1.22573.3 + 8.0.100-alpha.1.22573.4 + 8.0.100-alpha.1.22573.4 + 8.0.100-alpha.1.22573.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 - 8.0.0-alpha.1.22571.7 + 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22572.6 2.1.0 From ea221e399682d56ae3b21221e28e24cf0cdf6d34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 21:59:36 +0000 Subject: [PATCH 092/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 422f1f542..4062cf097 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - cd0cd2fb676760f567c9eabe16e352ebd876ca46 + 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 - + https://github.com/dotnet/sdk - cd0cd2fb676760f567c9eabe16e352ebd876ca46 + 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 - + https://github.com/dotnet/sdk - cd0cd2fb676760f567c9eabe16e352ebd876ca46 + 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 - + https://github.com/dotnet/sdk - cd0cd2fb676760f567c9eabe16e352ebd876ca46 + 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 @@ -153,14 +153,14 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - 0ac748cca1b976fc51aab7908446800c34f48b02 + d797c48da13aaa4dc7ae440ed7603c990cd44317 - + https://github.com/nuget/nuget.client - fd6441e3b421c07609a2db1abcf2ce844168dfe8 + 57d3a6d133442c4b0e0bfb7b05e1e00cca34258d diff --git a/eng/Versions.props b/eng/Versions.props index a8d7565c6..ace98fa44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22573.4 - 8.0.100-alpha.1.22573.4 - 8.0.100-alpha.1.22573.4 + 8.0.100-alpha.1.22573.5 + 8.0.100-alpha.1.22573.5 + 8.0.100-alpha.1.22573.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49584b542d58221409c6abf26d75139f5f8612af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 23:02:09 +0000 Subject: [PATCH 093/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4062cf097..71b085c98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 - + https://github.com/dotnet/aspnetcore - 93997b79e2531c1894119e9a63644875c82fc655 + ce98f65b4b2cf6360342e615d08fc679f16271a9 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 + 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 - + https://github.com/dotnet/sdk - 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 + 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 - + https://github.com/dotnet/sdk - 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 + 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 - + https://github.com/dotnet/sdk - 5e51e085f8dde84c4e343c0cb76c3d9640b44c29 + 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 @@ -142,9 +142,9 @@ f098763b32f8217d9d608ee2d690a0640d833cf3 - + https://github.com/dotnet/linker - 659f2b6a6bbbe41ab6366ac6a06bf86af2ec56cd + 0ac99a58d64da59ce2f0ab91578d4c3df41531f2 linker diff --git a/eng/Versions.props b/eng/Versions.props index ace98fa44..65fc9a368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 - 8.0.0-alpha.1.22572.5 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.2 0.2.0 - 8.0.100-alpha.1.22573.5 - 8.0.100-alpha.1.22573.5 - 8.0.100-alpha.1.22573.5 + 8.0.100-alpha.1.22573.8 + 8.0.100-alpha.1.22573.8 + 8.0.100-alpha.1.22573.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d7cb7a3217be7651c50f1d95ad01b06cf559e34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 03:42:34 +0000 Subject: [PATCH 094/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71b085c98..01d936ea3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 - + https://github.com/dotnet/aspnetcore - ce98f65b4b2cf6360342e615d08fc679f16271a9 + 971df4cbdc045c879f288b8cdfd726fd4212f882 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 + b503178a9941c9a7235078fad8da89b686ceb327 - + https://github.com/dotnet/sdk - 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 + b503178a9941c9a7235078fad8da89b686ceb327 - + https://github.com/dotnet/sdk - 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 + b503178a9941c9a7235078fad8da89b686ceb327 - + https://github.com/dotnet/sdk - 2761bb8dd5f29eaf135f2d8161a007de4dfac5a7 + b503178a9941c9a7235078fad8da89b686ceb327 diff --git a/eng/Versions.props b/eng/Versions.props index 65fc9a368..dfad1ef8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 - 8.0.0-alpha.1.22573.2 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.8 0.2.0 - 8.0.100-alpha.1.22573.8 - 8.0.100-alpha.1.22573.8 - 8.0.100-alpha.1.22573.8 + 8.0.100-alpha.1.22573.12 + 8.0.100-alpha.1.22573.12 + 8.0.100-alpha.1.22573.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f9617398e57473a6c160f45f7f0dea8e6f1d800 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 07:56:03 +0000 Subject: [PATCH 095/249] Update dependencies from https://github.com/dotnet/sdk build 20221123.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22573.15 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01d936ea3..5165fb648 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda - + https://github.com/dotnet/aspnetcore - 971df4cbdc045c879f288b8cdfd726fd4212f882 + 5fb23e3970ae03332be7ad8e559683a62ec3bfda https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b503178a9941c9a7235078fad8da89b686ceb327 + e951ee72e7766d9db282307adfa071a9929e2ad8 - + https://github.com/dotnet/sdk - b503178a9941c9a7235078fad8da89b686ceb327 + e951ee72e7766d9db282307adfa071a9929e2ad8 - + https://github.com/dotnet/sdk - b503178a9941c9a7235078fad8da89b686ceb327 + e951ee72e7766d9db282307adfa071a9929e2ad8 - + https://github.com/dotnet/sdk - b503178a9941c9a7235078fad8da89b686ceb327 + e951ee72e7766d9db282307adfa071a9929e2ad8 diff --git a/eng/Versions.props b/eng/Versions.props index dfad1ef8b..12f66be5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 - 8.0.0-alpha.1.22573.8 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.9 0.2.0 - 8.0.100-alpha.1.22573.12 - 8.0.100-alpha.1.22573.12 - 8.0.100-alpha.1.22573.12 + 8.0.100-alpha.1.22573.15 + 8.0.100-alpha.1.22573.15 + 8.0.100-alpha.1.22573.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67b906f5d87d006f7d6c576f19aec3448c2b5524 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 09:04:34 +0000 Subject: [PATCH 096/249] Update dependencies from https://github.com/dotnet/sdk build 20221124.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22574.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5165fb648..cb9a91c65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e951ee72e7766d9db282307adfa071a9929e2ad8 + 508792d5882ab197ddb44427bd53f013e4f4c232 - + https://github.com/dotnet/sdk - e951ee72e7766d9db282307adfa071a9929e2ad8 + 508792d5882ab197ddb44427bd53f013e4f4c232 - + https://github.com/dotnet/sdk - e951ee72e7766d9db282307adfa071a9929e2ad8 + 508792d5882ab197ddb44427bd53f013e4f4c232 - + https://github.com/dotnet/sdk - e951ee72e7766d9db282307adfa071a9929e2ad8 + 508792d5882ab197ddb44427bd53f013e4f4c232 diff --git a/eng/Versions.props b/eng/Versions.props index 12f66be5d..83372f037 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22573.15 - 8.0.100-alpha.1.22573.15 - 8.0.100-alpha.1.22573.15 + 8.0.100-alpha.1.22574.1 + 8.0.100-alpha.1.22574.1 + 8.0.100-alpha.1.22574.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4674bc3685a5f0d2548055ca7c3e50ab9fcde7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 10:07:36 +0000 Subject: [PATCH 097/249] Update dependencies from https://github.com/dotnet/sdk build 20221124.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22574.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb9a91c65..5226b9c2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ce06592c8277d78299e60a634b4431f68c5834b6 - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f - + https://github.com/dotnet/aspnetcore - 5fb23e3970ae03332be7ad8e559683a62ec3bfda + afb6ec434fe319676d290b778e85468261c2bc7f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 508792d5882ab197ddb44427bd53f013e4f4c232 + 795c7741eb344d9850b6b5b31bbac6dbfb7b273b - + https://github.com/dotnet/sdk - 508792d5882ab197ddb44427bd53f013e4f4c232 + 795c7741eb344d9850b6b5b31bbac6dbfb7b273b - + https://github.com/dotnet/sdk - 508792d5882ab197ddb44427bd53f013e4f4c232 + 795c7741eb344d9850b6b5b31bbac6dbfb7b273b - + https://github.com/dotnet/sdk - 508792d5882ab197ddb44427bd53f013e4f4c232 + 795c7741eb344d9850b6b5b31bbac6dbfb7b273b diff --git a/eng/Versions.props b/eng/Versions.props index 83372f037..2f3ad3c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 - 8.0.0-alpha.1.22573.9 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22573.12 0.2.0 - 8.0.100-alpha.1.22574.1 - 8.0.100-alpha.1.22574.1 - 8.0.100-alpha.1.22574.1 + 8.0.100-alpha.1.22574.4 + 8.0.100-alpha.1.22574.4 + 8.0.100-alpha.1.22574.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a06ace4697cef56a95a117e265d673cf5a42841 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 10:44:49 +0000 Subject: [PATCH 098/249] [main] Update dependencies from dotnet/arcade-services (#15030) [main] Update dependencies from dotnet/arcade-services - Add N/A tokens - Remove IRemoteFactory --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++-- eng/Versions.props | 2 +- src/VirtualMonoRepo/Tasks/RemoteFactory.cs | 42 ------------------- .../Tasks/VirtualMonoRepo_Initialize.cs | 3 +- 5 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 src/VirtualMonoRepo/Tasks/RemoteFactory.cs diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 26b81283a..c0c165e09 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22561.2", + "version": "1.1.0-beta.22573.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88dd16791..139873ebb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - e1c11c90d26581339cca9684399250101cbbc3bb + a0237ac5a1c16bca4ede7a6201f2abb165dcaabc - + https://github.com/dotnet/arcade-services - e1c11c90d26581339cca9684399250101cbbc3bb + a0237ac5a1c16bca4ede7a6201f2abb165dcaabc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3fb6360fd..94f1cefb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22561.2 + 1.1.0-beta.22573.3 diff --git a/src/VirtualMonoRepo/Tasks/RemoteFactory.cs b/src/VirtualMonoRepo/Tasks/RemoteFactory.cs deleted file mode 100644 index 24d8914f3..000000000 --- a/src/VirtualMonoRepo/Tasks/RemoteFactory.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Threading.Tasks; -using Microsoft.DotNet.DarcLib; -using Microsoft.DotNet.DarcLib.Helpers; -using Microsoft.Extensions.Logging; - -namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; - -internal class RemoteFactory : IRemoteFactory -{ - private readonly IProcessManager _processManager; - private readonly IVersionDetailsParser _versionDetailsParser; - private readonly string _tmpPath; - - public RemoteFactory(IProcessManager processManager, IVersionDetailsParser versionDetailsParser, string tmpPath) - { - _processManager = processManager; - _versionDetailsParser = versionDetailsParser; - _tmpPath = tmpPath; - } - - public Task GetBarOnlyRemoteAsync(ILogger logger) - { - throw new NotImplementedException(); - } - - public Task GetRemoteAsync(string repoUrl, ILogger logger) - { - var githubClient = new DarcLib.GitHubClient( - _processManager.GitExecutable, - accessToken: null, - logger, - _tmpPath, - cache: null); - - IRemote remote = new Remote(githubClient, barClient: null, _versionDetailsParser, logger); - return Task.FromResult(remote); - } -} diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 7a28720d9..6390e4b56 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -61,7 +61,6 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask private IServiceProvider CreateServiceProvider() => new ServiceCollection() .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) - .AddSingleton(sp => ActivatorUtilities.CreateInstance(sp, TmpPath)) - .AddVmrManagers("git", sp => new VmrInfo(VmrPath, TmpPath)) + .AddVmrManagers("git", VmrPath, TmpPath, null, null) .BuildServiceProvider(); } From 56992057ae73657c8603dabc62cbff55d20c6270 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 13:28:07 +0000 Subject: [PATCH 099/249] Update dependencies from https://github.com/dotnet/arcade build 20221122.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22572.5 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22513.1 -> To Version 1.0.0-beta.22555.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/native/init-compiler.sh | 4 ++-- eng/common/sdk-task.ps1 | 2 +- .../templates/job/publish-build-assets.yml | 7 +------ .../templates/post-build/common-variables.yml | 4 ---- eng/common/templates/post-build/post-build.yml | 6 ------ eng/common/tools.ps1 | 5 +++-- global.json | 4 ++-- 10 files changed, 25 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 139873ebb..e83b865d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 37095730a5eebb50fed86a0d3013d90408a05609 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 37095730a5eebb50fed86a0d3013d90408a05609 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 37095730a5eebb50fed86a0d3013d90408a05609 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - 366ad9b9f7af7d0eddbd36d1e13d8fcff0ac99db + 52e3661e093095cf353a4531cbfac316e487c4c0 diff --git a/eng/Versions.props b/eng/Versions.props index 94f1cefb3..d26e810b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22554.2 + 8.0.0-beta.22572.5 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 561576be9..964610524 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..292ebb653 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -132,8 +132,8 @@ if [[ -z "$CC" ]]; then exit 1 fi -# Only lld version >= 9 can be considered stable -if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then +# Only lld version >= 9 can be considered stable. lld doesn't support s390x. +if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b..e10a59687 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1f1b78f2d..42017109f 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,6 +34,7 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets @@ -73,12 +74,6 @@ jobs: - task: NuGetAuthenticate@0 - - task: PowerShell@2 - displayName: Enable cross-org NuGet feed authentication - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 displayName: Publish Build Assets inputs: diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..c24193acf 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,8 +1,4 @@ variables: - - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 91251d089..ef720f9d7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -172,12 +172,6 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - # Signing validation will optionally work with the buildmanifest file which is downloaded from # Azure DevOps above. - task: PowerShell@2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 449126943..fc56f63f6 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -413,6 +413,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if($vsMinVersion -lt $vsMinVersionReqd){ Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible" $xcopyMSBuildVersion = $defaultXCopyMSBuildVersion + $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] } else{ # If the VS version IS compatible, look for an xcopy msbuild package diff --git a/global.json b/global.json index c6e518bc0..67b6901a0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22554.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22572.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22572.5" } } From 9a6ad5a3548331884388d0727bd0434221a5d701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 20:38:16 +0000 Subject: [PATCH 100/249] Update dependencies from https://github.com/dotnet/sdk build 20221124.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22574.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22572.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5226b9c2b..25e60a050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 795c7741eb344d9850b6b5b31bbac6dbfb7b273b + fa0703396c322cd2ec521007c315d22f99a580ea - + https://github.com/dotnet/sdk - 795c7741eb344d9850b6b5b31bbac6dbfb7b273b + fa0703396c322cd2ec521007c315d22f99a580ea - + https://github.com/dotnet/sdk - 795c7741eb344d9850b6b5b31bbac6dbfb7b273b + fa0703396c322cd2ec521007c315d22f99a580ea - + https://github.com/dotnet/sdk - 795c7741eb344d9850b6b5b31bbac6dbfb7b273b + fa0703396c322cd2ec521007c315d22f99a580ea @@ -137,9 +137,9 @@ ffb3909124177abf1907ba725969849841c94725 - + https://github.com/microsoft/vstest - f098763b32f8217d9d608ee2d690a0640d833cf3 + 94cde14e9c35e1eaffe063acf7a191d1d24ad29a diff --git a/eng/Versions.props b/eng/Versions.props index 2f3ad3c43..4a0b71f95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22574.4 - 8.0.100-alpha.1.22574.4 - 8.0.100-alpha.1.22574.4 + 8.0.100-alpha.1.22574.5 + 8.0.100-alpha.1.22574.5 + 8.0.100-alpha.1.22574.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221122-02 + 17.5.0-preview-20221123-03 8.0.0-alpha.1.22557.12 From c6cbb8cbc88fe93b2910ca50c55e37747bcc3b9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 14:43:40 +0000 Subject: [PATCH 101/249] Update dependencies from https://github.com/dotnet/arcade build 20221124.1 (#15033) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e83b865d5..cbaf800cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 37095730a5eebb50fed86a0d3013d90408a05609 + 7cd5e97416ad782621a2cce154d659253c06223a - + https://github.com/dotnet/arcade - 37095730a5eebb50fed86a0d3013d90408a05609 + 7cd5e97416ad782621a2cce154d659253c06223a - + https://github.com/dotnet/arcade - 37095730a5eebb50fed86a0d3013d90408a05609 + 7cd5e97416ad782621a2cce154d659253c06223a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d26e810b3..2c0dff3e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22572.5 + 8.0.0-beta.22574.1 diff --git a/global.json b/global.json index 67b6901a0..3091f1fff 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22572.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22572.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22574.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22574.1" } } From f9f6747b9f4701091fd5231414768ef462f342e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 25 Nov 2022 18:24:25 +0100 Subject: [PATCH 102/249] Make links from VMR's README to Arcade docs relative (#15034) Resolves https://github.com/dotnet/arcade/issues/11468 --- .../content/eng/bootstrap/README.template.md | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md index dd184e41a..3393b82b3 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md +++ b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md @@ -14,9 +14,9 @@ In the VMR, you can find: - *[in future]* E2E tests for the whole .NET product. Just like the development repositories, the VMR will have a release branch for every feature band (e.g. `release/8.0.1xx-preview1`). -Similarly, VMR's `main` branch will follow `main` branches of product repositories (see [Synchronization Based on Declared Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies)). +Similarly, VMR's `main` branch will follow `main` branches of product repositories (see [Synchronization Based on Declared Dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies)). -More in-depth documentation about the VMR can be found in [VMR Design And Operation](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#layout). +More in-depth documentation about the VMR can be found in [VMR Design And Operation](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#layout). See also [dotnet/source-build](https://github.com/dotnet/source-build) for more information about our whole-product source-build. ## Goals @@ -24,7 +24,7 @@ See also [dotnet/source-build](https://github.com/dotnet/source-build) for more - The main purpose of the [dotnet/dotnet](https://github.com/dotnet/dotnet) repository is to have all source code necessary to build the .NET product available in one repository and identified by a single commit. - The VMR also aims to become the place from which we release and service future versions of .NET to reduce the complexity of the product construction process. This should allow our partners and and 3rd parties to easily build, test and modify .NET using their custom infrastructure as well as make the process available to the community. - Lastly, we hope to solve other problems that the current multi-repo setup brings: - - Enable the standard [down-/up-stream open-source model](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md). + - Enable the standard [down-/up-stream open-source model](src/arcade/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md). - Fulfill requirements of .NET distro builders such as RedHat or Canonical to natively include .NET in their distribution repositories. - Simplify scenarios such as client-run testing of bug fixes and improvements. The build should work in an offline environment too for certain platforms. - Enable developers to make and test changes spanning multiple repositories. @@ -33,12 +33,12 @@ See also [dotnet/source-build](https://github.com/dotnet/source-build) for more ## Limitations **This is a work-in-progress and an experiment.** -There are considerable limitations to what is possible at the moment. For an extensive list of current limitations, please see [Temporary Mechanics](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#temporary-mechanics). +There are considerable limitations to what is possible at the moment. For an extensive list of current limitations, please see [Temporary Mechanics](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#temporary-mechanics). The VMR is expected to become non-experimental by .NET 8 Preview 1 (Februrary, 2023). This means it won't be short-lived anymore and we won't be reserving the right to delete and re-create it anymore. Other limitations might apply until the .NET 9 timeframe. -See the [Unified Build roadmap](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Roadmap.md) for more details. +See the [Unified Build roadmap](src/arcade/Documentation/UnifiedBuild/Roadmap.md) for more details. ### Supported platforms @@ -55,12 +55,12 @@ Building the product offline is not fully working at the moment. The `--online` For the time being, the source code only flows one way - from the development repos into the VMR. More details on this process: -- [Source Synchronization Process](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) -- [Synchronization Based on Declared Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies) -- [Moving Code and Dependencies between the VMR and Development Repos](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#moving-code-and-dependencies-between-the-vmr-and-development-repos) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) +- [Synchronization Based on Declared Dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#synchronization-based-on-declared-dependencies) +- [Moving Code and Dependencies between the VMR and Development Repos](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#moving-code-and-dependencies-between-the-vmr-and-development-repos) We expect the code flow to start working both ways in the .NET 9 timeframe. -See the [Unified Build roadmap](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Roadmap.md) for more details. +See the [Unified Build roadmap](src/arcade/Documentation/UnifiedBuild/Roadmap.md) for more details. ### Contribution @@ -123,8 +123,8 @@ The dependencies for building .NET from source can be found [here](https://githu ## List of components To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: -- [Strategy for managing external source dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) -- [Source Synchronization Process](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) +- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) ### Detailed list @@ -144,10 +144,10 @@ For issues with the VMR itself, please use the [source-build repository](https:/ ## Useful Links - Design documentation for the VMR - a set of documents describing the high-level design and the why's and how's - - [Design and Operation](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md) - - [Upstream/Downstream Relationships](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md) - - [Code and Build Workflow](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Code-And-Build-Workflow.md) - - [Strategy for Managing External Source Dependencies](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) + - [Design and Operation](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md) + - [Upstream/Downstream Relationships](src/arcade/Documentation/UnifiedBuild/VMR-Upstream-Downstream.md) + - [Code and Build Workflow](src/arcade/Documentation/UnifiedBuild/VMR-Code-And-Build-Workflow.md) + - [Strategy for Managing External Source Dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) - [.NET Source-Build](https://github.com/dotnet/source-build) - [What is .NET](https://dotnet.microsoft.com) From cf82ef92e53f512456b269ae5f4bc7bd434c81ee Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sat, 26 Nov 2022 08:55:22 +0200 Subject: [PATCH 103/249] improve format of productCommits file --- .../targets/GenerateBundledVersions.targets | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 8eb7054e6..847a27b2c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -45,15 +45,22 @@ + + + + + + + From 7b6c80b86a791d55cdeb9ad980c2747d76595f64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Nov 2022 13:27:37 +0000 Subject: [PATCH 104/249] Update dependencies from https://github.com/dotnet/arcade build 20221125.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22574.1 -> To Version 8.0.0-beta.22575.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbaf800cb..2dfef7015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 7cd5e97416ad782621a2cce154d659253c06223a + b61fcdfe86b30fe91898bfb296f4f4396fe5d87a - + https://github.com/dotnet/arcade - 7cd5e97416ad782621a2cce154d659253c06223a + b61fcdfe86b30fe91898bfb296f4f4396fe5d87a - + https://github.com/dotnet/arcade - 7cd5e97416ad782621a2cce154d659253c06223a + b61fcdfe86b30fe91898bfb296f4f4396fe5d87a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2c0dff3e6..da7eeda9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22574.1 + 8.0.0-beta.22575.1 diff --git a/global.json b/global.json index 3091f1fff..c600b9564 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22574.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22574.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22575.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22575.1" } } From 574f3a5275d1ebe7e24373a5c8d3e0eb464baded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 28 Nov 2022 16:41:37 +0100 Subject: [PATCH 105/249] Allow specifying a revision to initialize VMR from (#15038) --- src/VirtualMonoRepo/InitializeVMR.proj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 8146ae460..fb5070017 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -55,6 +55,7 @@ $([System.IO.Path]::GetFileName("$(RepoRoot.TrimEnd('/').TrimEnd('\\'))")) + @(RootRepoCommitSha) @@ -62,14 +63,14 @@ - + Date: Mon, 28 Nov 2022 18:04:48 +0000 Subject: [PATCH 106/249] [main] Update dependencies from dotnet/arcade-services (#15035) [main] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c0c165e09..9b7781bef 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22573.3", + "version": "1.1.0-beta.22578.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dfef7015..bdc55eded 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade b61fcdfe86b30fe91898bfb296f4f4396fe5d87a - + https://github.com/dotnet/arcade-services - a0237ac5a1c16bca4ede7a6201f2abb165dcaabc + a1e2957fadc434c33a83fcf6a4e04ce6f231ee6b - + https://github.com/dotnet/arcade-services - a0237ac5a1c16bca4ede7a6201f2abb165dcaabc + a1e2957fadc434c33a83fcf6a4e04ce6f231ee6b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index da7eeda9e..d409f73a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22573.3 + 1.1.0-beta.22578.1 From fb558269a38bc9f9d79ca7d4e36d8169cf25aed4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 13:23:52 -0800 Subject: [PATCH 107/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221128.1 (#15043) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22565.1 -> To Version 8.0.0-alpha.1.22578.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdc55eded..6214ce3e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a023ffe86a62cd363cf0d1c61f9fc55c015f8f3e + 7ec4b0aabc55efa11515c987fb0251d39c29f06c From 10b2e5501e78bd948aacb3dd7894221cba682cae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 02:24:53 +0000 Subject: [PATCH 108/249] Update dependencies from https://github.com/dotnet/sdk build 20221128.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22578.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22575.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++-------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25e60a050..025df0184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ce06592c8277d78299e60a634b4431f68c5834b6 + 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 - + https://github.com/dotnet/aspnetcore - afb6ec434fe319676d290b778e85468261c2bc7f + f52ae1f2e40b78fdb84c4022af04e157cf503c38 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fa0703396c322cd2ec521007c315d22f99a580ea + 39740d8505bb1d10eecb042e10b3e1ad66391401 - + https://github.com/dotnet/sdk - fa0703396c322cd2ec521007c315d22f99a580ea + 39740d8505bb1d10eecb042e10b3e1ad66391401 - + https://github.com/dotnet/sdk - fa0703396c322cd2ec521007c315d22f99a580ea + 39740d8505bb1d10eecb042e10b3e1ad66391401 - + https://github.com/dotnet/sdk - fa0703396c322cd2ec521007c315d22f99a580ea + 39740d8505bb1d10eecb042e10b3e1ad66391401 @@ -128,23 +128,23 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - ffb3909124177abf1907ba725969849841c94725 + 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/dotnet/fsharp - ffb3909124177abf1907ba725969849841c94725 + 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - 94cde14e9c35e1eaffe063acf7a191d1d24ad29a + 96de7ff03a297a0f96a1dc3e8586b3a9d08c74db - + https://github.com/dotnet/linker - 0ac99a58d64da59ce2f0ab91578d4c3df41531f2 + a5427e35fd70850d108d97ac6cbc3fac809700fb linker @@ -158,9 +158,9 @@ d797c48da13aaa4dc7ae440ed7603c990cd44317 - + https://github.com/nuget/nuget.client - 57d3a6d133442c4b0e0bfb7b05e1e00cca34258d + dfe13cc99d13de74f41e9cff35600a2c8958aac1 diff --git a/eng/Versions.props b/eng/Versions.props index 4a0b71f95..cc639e2d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,38 +54,38 @@ - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 - 8.0.0-alpha.1.22573.12 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22576.1 0.2.0 - 8.0.100-alpha.1.22574.5 - 8.0.100-alpha.1.22574.5 - 8.0.100-alpha.1.22574.5 + 8.0.100-alpha.1.22578.2 + 8.0.100-alpha.1.22578.2 + 8.0.100-alpha.1.22578.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22572.6 - 8.0.0-alpha.1.22572.6 + 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22575.4 2.1.0 @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221123-03 + 17.5.0-preview-20221127-01 8.0.0-alpha.1.22557.12 From daa2eb1882e4a287dc5d7b49e3283261cd3dd51d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 03:13:44 +0000 Subject: [PATCH 109/249] Update dependencies from https://github.com/dotnet/sdk build 20221128.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22578.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22575.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 025df0184..a96b34293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 39740d8505bb1d10eecb042e10b3e1ad66391401 + 0c27722842431eeb7e7db269a87a12b4ed360c19 - + https://github.com/dotnet/sdk - 39740d8505bb1d10eecb042e10b3e1ad66391401 + 0c27722842431eeb7e7db269a87a12b4ed360c19 - + https://github.com/dotnet/sdk - 39740d8505bb1d10eecb042e10b3e1ad66391401 + 0c27722842431eeb7e7db269a87a12b4ed360c19 - + https://github.com/dotnet/sdk - 39740d8505bb1d10eecb042e10b3e1ad66391401 + 0c27722842431eeb7e7db269a87a12b4ed360c19 diff --git a/eng/Versions.props b/eng/Versions.props index cc639e2d9..71dd7c989 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22578.2 - 8.0.100-alpha.1.22578.2 - 8.0.100-alpha.1.22578.2 + 8.0.100-alpha.1.22578.12 + 8.0.100-alpha.1.22578.12 + 8.0.100-alpha.1.22578.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e821696518a0dd597917aa8801ca71fa92b8152a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 04:03:34 +0000 Subject: [PATCH 110/249] Update dependencies from https://github.com/dotnet/sdk build 20221128.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22578.13 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96b34293..d6d2305ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0c46b34ed70ad23d8323d32d1c8eeb9f4819ae68 + 1771d63827387b49dcd8c33b95f1512f4f11e368 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0c27722842431eeb7e7db269a87a12b4ed360c19 + 220b872843007a111b83419f4e429312e889a73d - + https://github.com/dotnet/sdk - 0c27722842431eeb7e7db269a87a12b4ed360c19 + 220b872843007a111b83419f4e429312e889a73d - + https://github.com/dotnet/sdk - 0c27722842431eeb7e7db269a87a12b4ed360c19 + 220b872843007a111b83419f4e429312e889a73d - + https://github.com/dotnet/sdk - 0c27722842431eeb7e7db269a87a12b4ed360c19 + 220b872843007a111b83419f4e429312e889a73d diff --git a/eng/Versions.props b/eng/Versions.props index 71dd7c989..64de52de9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22578.12 - 8.0.100-alpha.1.22578.12 - 8.0.100-alpha.1.22578.12 + 8.0.100-alpha.1.22578.13 + 8.0.100-alpha.1.22578.13 + 8.0.100-alpha.1.22578.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22575.4 - 8.0.0-alpha.1.22575.4 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 2.1.0 From 8bc8515e197fc79e6501a23c0a0d34b2dc262a6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 07:04:15 +0000 Subject: [PATCH 111/249] Update dependencies from https://github.com/dotnet/sdk build 20221128.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22578.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6d2305ad..df323e443 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 - + https://github.com/dotnet/aspnetcore - f52ae1f2e40b78fdb84c4022af04e157cf503c38 + 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 220b872843007a111b83419f4e429312e889a73d + fad4629c5f219f5c46bac7d80aed30fe3ceb8468 - + https://github.com/dotnet/sdk - 220b872843007a111b83419f4e429312e889a73d + fad4629c5f219f5c46bac7d80aed30fe3ceb8468 - + https://github.com/dotnet/sdk - 220b872843007a111b83419f4e429312e889a73d + fad4629c5f219f5c46bac7d80aed30fe3ceb8468 - + https://github.com/dotnet/sdk - 220b872843007a111b83419f4e429312e889a73d + fad4629c5f219f5c46bac7d80aed30fe3ceb8468 @@ -142,9 +142,9 @@ 96de7ff03a297a0f96a1dc3e8586b3a9d08c74db - + https://github.com/dotnet/linker - a5427e35fd70850d108d97ac6cbc3fac809700fb + dfe94f24cef0ae9be92dd4ecc4a470e45d1592e1 linker diff --git a/eng/Versions.props b/eng/Versions.props index 64de52de9..7aaf3121c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 - 8.0.0-alpha.1.22576.1 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22578.10 0.2.0 - 8.0.100-alpha.1.22578.13 - 8.0.100-alpha.1.22578.13 - 8.0.100-alpha.1.22578.13 + 8.0.100-alpha.1.22578.14 + 8.0.100-alpha.1.22578.14 + 8.0.100-alpha.1.22578.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7e39f547242bb4c19ea1ac2e88bf62b0695f48f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 13:28:55 +0000 Subject: [PATCH 112/249] Update dependencies from https://github.com/dotnet/arcade build 20221128.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22575.1 -> To Version 8.0.0-beta.22578.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6214ce3e5..cd4bdbfe2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - b61fcdfe86b30fe91898bfb296f4f4396fe5d87a + 3817f2b38a05c37c950715f84c95d452bcacfe52 - + https://github.com/dotnet/arcade - b61fcdfe86b30fe91898bfb296f4f4396fe5d87a + 3817f2b38a05c37c950715f84c95d452bcacfe52 - + https://github.com/dotnet/arcade - b61fcdfe86b30fe91898bfb296f4f4396fe5d87a + 3817f2b38a05c37c950715f84c95d452bcacfe52 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d409f73a0..24382fc64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22575.1 + 8.0.0-beta.22578.1 diff --git a/global.json b/global.json index c600b9564..10daad3f5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22575.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22575.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22578.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22578.1" } } From 6d6ba1764bf6e83b20b6b772c6800c4d215361b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 13:47:54 +0000 Subject: [PATCH 113/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221128.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22560.1 -> To Version 8.0.0-alpha.1.22578.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6214ce3e5..d15b57e28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6993c3296c6b25dbe62fef14e3ed7f3dcbb5f34 + af8eedc4daa3d1e29af9d493f657b1927b24c957 From db12171a06f28200f46fac477d86943055a81975 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 19:22:59 +0000 Subject: [PATCH 114/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df323e443..3dbbd3c93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fad4629c5f219f5c46bac7d80aed30fe3ceb8468 + 0d80e64201ec25f8e9b5776530c625774c6a6147 - + https://github.com/dotnet/sdk - fad4629c5f219f5c46bac7d80aed30fe3ceb8468 + 0d80e64201ec25f8e9b5776530c625774c6a6147 - + https://github.com/dotnet/sdk - fad4629c5f219f5c46bac7d80aed30fe3ceb8468 + 0d80e64201ec25f8e9b5776530c625774c6a6147 - + https://github.com/dotnet/sdk - fad4629c5f219f5c46bac7d80aed30fe3ceb8468 + 0d80e64201ec25f8e9b5776530c625774c6a6147 @@ -128,11 +128,11 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/dotnet/fsharp 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a @@ -153,9 +153,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - d797c48da13aaa4dc7ae440ed7603c990cd44317 + a9df31a0a20c15e3930336dd053487665a0f5fb9 diff --git a/eng/Versions.props b/eng/Versions.props index 7aaf3121c..58c6e9134 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22578.14 - 8.0.100-alpha.1.22578.14 - 8.0.100-alpha.1.22578.14 + 8.0.100-alpha.1.22579.4 + 8.0.100-alpha.1.22579.4 + 8.0.100-alpha.1.22579.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e58fb4c4c359e5df3b1ee244da40fe0ee723dbf4 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 29 Nov 2022 19:24:34 +0000 Subject: [PATCH 115/249] Update source-build toolset --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d9568376..1bf480e4e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23" + "dotnet": "7.0.100" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 515f5be3f2be2967a70f83f5b6422f5147496133 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 20:13:43 +0000 Subject: [PATCH 116/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d6db4f93..c41e10c88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0d80e64201ec25f8e9b5776530c625774c6a6147 + cde435afa154938d93ff0ea53ee94f58a424176f - + https://github.com/dotnet/sdk - 0d80e64201ec25f8e9b5776530c625774c6a6147 + cde435afa154938d93ff0ea53ee94f58a424176f - + https://github.com/dotnet/sdk - 0d80e64201ec25f8e9b5776530c625774c6a6147 + cde435afa154938d93ff0ea53ee94f58a424176f - + https://github.com/dotnet/sdk - 0d80e64201ec25f8e9b5776530c625774c6a6147 + cde435afa154938d93ff0ea53ee94f58a424176f diff --git a/eng/Versions.props b/eng/Versions.props index 128834b1e..d60a06391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22579.4 - 8.0.100-alpha.1.22579.4 - 8.0.100-alpha.1.22579.4 + 8.0.100-alpha.1.22579.8 + 8.0.100-alpha.1.22579.8 + 8.0.100-alpha.1.22579.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 924947c797ae8ff6c85ad7fc09fe58e5f4ddb0cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 21:08:43 +0000 Subject: [PATCH 117/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c41e10c88..6de66b35f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - cde435afa154938d93ff0ea53ee94f58a424176f + 7278db2c9d66b3424245bec0096435e8e8190d73 - + https://github.com/dotnet/sdk - cde435afa154938d93ff0ea53ee94f58a424176f + 7278db2c9d66b3424245bec0096435e8e8190d73 - + https://github.com/dotnet/sdk - cde435afa154938d93ff0ea53ee94f58a424176f + 7278db2c9d66b3424245bec0096435e8e8190d73 - + https://github.com/dotnet/sdk - cde435afa154938d93ff0ea53ee94f58a424176f + 7278db2c9d66b3424245bec0096435e8e8190d73 @@ -137,9 +137,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - 96de7ff03a297a0f96a1dc3e8586b3a9d08c74db + a61ec9013bbadc3401a7ca3f17193d027b6ef4fe diff --git a/eng/Versions.props b/eng/Versions.props index d60a06391..c26548daa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22579.8 - 8.0.100-alpha.1.22579.8 - 8.0.100-alpha.1.22579.8 + 8.0.100-alpha.1.22579.12 + 8.0.100-alpha.1.22579.12 + 8.0.100-alpha.1.22579.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221127-01 + 17.5.0-preview-20221128-04 8.0.0-alpha.1.22557.12 From 845f82f047e608a4db44d725851fa1bcefe49276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 21:42:01 +0000 Subject: [PATCH 118/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221129.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22578.1 -> To Version 8.0.0-alpha.1.22579.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d15b57e28..bffbb966e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 7ec4b0aabc55efa11515c987fb0251d39c29f06c + bed0fd20a5a55843c1f04ef195ef2fd7171ae715 From 2adbf40116866ca7f85e69a7ed5406ef4e8ff986 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Tue, 29 Nov 2022 15:31:11 -0700 Subject: [PATCH 119/249] Use ".NET" in preference to ".NET Core" (#14902) * Use ".NET" in preference to ".NET Core" We're consistently using ".NET" for recent downloads (eg see https://dotnet.microsoft.com/en-us/download) and increasingly it is clearer to use ".NET" instead of ".NET Core". Change the wording, and explain the meanings. * Update README.md * Apply suggestions from code review Co-authored-by: Maira Wenzel * feedbacK * Apply suggestions from code review Co-authored-by: Maira Wenzel Co-authored-by: Maira Wenzel --- README.md | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 811a07c0d..4a1955267 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# .NET Core SDK +# .NET SDK Installers [![Join the chat at https://gitter.im/dotnet/cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotnet/cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GitHub release](https://img.shields.io/github/release/dotnet/installer.svg)](https://GitHub.com/dotnet/installer/releases/) @@ -11,13 +11,22 @@ [![GitHub contributors](https://img.shields.io/github/contributors/dotnet/installer.svg)](https://GitHub.com/dotnet/installer/graphs/contributors/) [![Commit Activity](https://img.shields.io/github/commit-activity/m/dotnet/installer)]() +This repo contains the source code for the cross-platform [.NET](http://github.com/dotnet/core) SDK. It aggregates the .NET toolchain, the .NET runtime, the templates, and the .NET Windows Desktop runtime. It produces zip, tarballs, and native packages for various supported platforms. -This repo contains the source code for the cross-platform [.NET Core](http://github.com/dotnet/core) SDK. It aggregates the .NET Toolchain, the .NET Core runtime, the templates, and the .NET Core Windows Desktop runtime. It produces zip, tarballs, and native packages for various supported platforms. - -Looking for released versions of the .NET Core tooling? +Looking for released versions of the .NET tooling? ---------------------------------------- -Download released versions of the .NET Core tools (CLI, MSBuild and the new csproj) at https://dot.net/core. +The links below are for preview versions of .NET tooling. Prefer to use released versions of the .NET tools? Go to https://dot.net/download. + +Looking for .NET Framework downloads? +---------------------------------------- + +.NET Framework is the product from which the .NET Core project originated. .NET Core (mostly just called ".NET" here) adds many features and improvements and supports many more platforms than .NET Framework. .NET Framework remains fully supported and you can find the downloads on the [.NET website](https://dotnet.microsoft.com/download/dotnet-framework). For new projects, we recommend you use .NET Core. + +Want to contribute or find out more about the .NET project? +---------------------------------------- + +This repo is for the installers. Most of the implementation is in other repos, such as the [dotnet/runtime repo](https://github.com/dotnet/runtime) or the [dotnet/aspnetcore repo](https://github.com/dotnet/aspnetcore) and [many others](https://github.com/dotnet/core/blob/main/Documentation/core-repos.md). We welcome you to join us there! Found an issue? --------------- @@ -25,7 +34,7 @@ You can consult the [Documents Index for the SDK repo](https://github.com/dotnet This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). -# Build .NET installer +# Build .NET installer The repository contains native code project required for the Windows installer. If you intend to build it locally on Windows, you will need to ensure that you have the following items installed. - Install CMAKE 3.21.0 is required if you're building VS 17.0. Make sure to add CMAKE to your PATH (the installer will prompt you). @@ -109,7 +118,7 @@ Visibility|All legs| ## Installers and Binaries -You can download the .NET Core SDK as either an installer (MSI, PKG) or a zip (zip, tar.gz). The .NET Core SDK contains both the .NET Core runtime and CLI tools. +You can download the .NET SDK as either an installer (MSI, PKG) or a zip (zip, tar.gz). The .NET SDK contains both the .NET runtime and CLI tools. **Note:** Be aware that the following installers are the **latest bits**. If you want to install the latest released versions, check out the [preceding section](#looking-for-released-versions-of-the-net-core-tooling). @@ -135,7 +144,7 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -Please do not directly edit the table below. Use https://github.com/dotnet/installer/tree/main/tools/sdk-readme-table-generator to help you generate it. Make sure to run the table generator test and make any changes to the generator along with your changes to the table. Daily servicing builds have been removed as all servicing is done in private repos to avoid disclosure of critical security fixes. All public servicing builds can be downloaded at http://aka.ms/dotnet-download. +Do not directly edit the table below. Use https://github.com/dotnet/installer/tree/main/tools/sdk-readme-table-generator to help you generate it. Make sure to run the table generator test and make any changes to the generator along with your changes to the table. Daily servicing builds aren't shown here because they may contain upcoming security fixes. All public servicing builds can be downloaded at http://aka.ms/dotnet-download. ### Table *Note* the 7.0.100 build will be finished internally. Below is the last public version available from that branch but is not fully updated with the final runtime. @@ -161,7 +170,7 @@ Reference notes: > * [Host, Host FX Resolver, and Shared Framework](https://github.com/dotnet/runtime/blob/main/docs/project/dogfooding.md#nightly-builds-table) > * [ASP.NET Core Shared Framework](https://github.com/aspnet/AspNetCore/blob/main/docs/DailyBuilds.md) -.NET Core SDK 2.x downloads can be found here: [.NET Core SDK 2.x Installers and Binaries](Downloads2.x.md) +.NET Core SDK 2.x downloads can be found at [.NET Core SDK 2.x Installers and Binaries](Downloads2.x.md) but they are [out of support](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). [win-x64-badge-main]: https://aka.ms/dotnet/8.0.1xx/daily/win_x64_Release_version_badge.svg [win-x64-version-main]: https://aka.ms/dotnet/8.0.1xx/daily/productCommit-win-x64.txt From f3c6575a63419372597086dfd4dc6fd03ba4b5af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 22:32:04 +0000 Subject: [PATCH 120/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.18 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6de66b35f..b417e08e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1771d63827387b49dcd8c33b95f1512f4f11e368 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 - + https://github.com/dotnet/aspnetcore - 2c0b763e9b5c5f9d79fa1ff5fb9a193c76157329 + a9b88283846a6662ea686514aad170ed73650e71 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7278db2c9d66b3424245bec0096435e8e8190d73 + 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 - + https://github.com/dotnet/sdk - 7278db2c9d66b3424245bec0096435e8e8190d73 + 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 - + https://github.com/dotnet/sdk - 7278db2c9d66b3424245bec0096435e8e8190d73 + 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 - + https://github.com/dotnet/sdk - 7278db2c9d66b3424245bec0096435e8e8190d73 + 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 diff --git a/eng/Versions.props b/eng/Versions.props index c26548daa..d533b06d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 - 8.0.0-alpha.1.22578.10 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.1 0.2.0 - 8.0.100-alpha.1.22579.12 - 8.0.100-alpha.1.22579.12 - 8.0.100-alpha.1.22579.12 + 8.0.100-alpha.1.22579.18 + 8.0.100-alpha.1.22579.18 + 8.0.100-alpha.1.22579.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28655bbb3f0bd665f64f087772e4e228a0b44b29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 23:18:37 +0000 Subject: [PATCH 121/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.32 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b417e08e5..6e258e2b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 + 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 - + https://github.com/dotnet/sdk - 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 + 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 - + https://github.com/dotnet/sdk - 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 + 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 - + https://github.com/dotnet/sdk - 08f3e5ca0d2b85e4f08e0afc79d92e1dcab4d900 + 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 @@ -142,9 +142,9 @@ a61ec9013bbadc3401a7ca3f17193d027b6ef4fe - + https://github.com/dotnet/linker - dfe94f24cef0ae9be92dd4ecc4a470e45d1592e1 + 261e91198bc9ec29f6904eff764cb65a25bd76ac linker diff --git a/eng/Versions.props b/eng/Versions.props index d533b06d3..2b9006f16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22579.18 - 8.0.100-alpha.1.22579.18 - 8.0.100-alpha.1.22579.18 + 8.0.100-alpha.1.22579.32 + 8.0.100-alpha.1.22579.32 + 8.0.100-alpha.1.22579.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d7b6bffc1aff21e045e35fcd24801ecd63e9c70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 02:34:15 +0000 Subject: [PATCH 122/249] Update dependencies from https://github.com/dotnet/sdk build 20221129.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22579.47 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e258e2b2..a5fb64120 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1771d63827387b49dcd8c33b95f1512f4f11e368 + 0eaf12b95e6508f6b09593e7bb553961127b4d59 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 + 1fac764316feaefedbdf009f58efdaeeebc58bda - + https://github.com/dotnet/sdk - 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 + 1fac764316feaefedbdf009f58efdaeeebc58bda - + https://github.com/dotnet/sdk - 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 + 1fac764316feaefedbdf009f58efdaeeebc58bda - + https://github.com/dotnet/sdk - 2fdd781d1f33cee8f1e1f6dcc6585695010117e0 + 1fac764316feaefedbdf009f58efdaeeebc58bda diff --git a/eng/Versions.props b/eng/Versions.props index 2b9006f16..4ea0416e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22579.32 - 8.0.100-alpha.1.22579.32 - 8.0.100-alpha.1.22579.32 + 8.0.100-alpha.1.22579.47 + 8.0.100-alpha.1.22579.47 + 8.0.100-alpha.1.22579.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22578.7 2.1.0 From 88c8fafded041647c2902889bbba8b15cd728a3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 08:48:23 +0000 Subject: [PATCH 123/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5fb64120..f0ce88c2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 0eaf12b95e6508f6b09593e7bb553961127b4d59 - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e - + https://github.com/dotnet/aspnetcore - a9b88283846a6662ea686514aad170ed73650e71 + 522bbeef952a78d2e0907e23391e18f0cf583a8e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1fac764316feaefedbdf009f58efdaeeebc58bda + 839fb878319a8c3e741b91a3082ee05afbad7b09 - + https://github.com/dotnet/sdk - 1fac764316feaefedbdf009f58efdaeeebc58bda + 839fb878319a8c3e741b91a3082ee05afbad7b09 - + https://github.com/dotnet/sdk - 1fac764316feaefedbdf009f58efdaeeebc58bda + 839fb878319a8c3e741b91a3082ee05afbad7b09 - + https://github.com/dotnet/sdk - 1fac764316feaefedbdf009f58efdaeeebc58bda + 839fb878319a8c3e741b91a3082ee05afbad7b09 diff --git a/eng/Versions.props b/eng/Versions.props index 4ea0416e1..86621e3e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 - 8.0.0-alpha.1.22579.1 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22579.20 0.2.0 - 8.0.100-alpha.1.22579.47 - 8.0.100-alpha.1.22579.47 - 8.0.100-alpha.1.22579.47 + 8.0.100-alpha.1.22580.1 + 8.0.100-alpha.1.22580.1 + 8.0.100-alpha.1.22580.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fbecc81334b9491b515111a6b0067c91cc21ffdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 09:38:32 +0000 Subject: [PATCH 124/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22578.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0ce88c2b..808b37916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 839fb878319a8c3e741b91a3082ee05afbad7b09 + 6f240068ce0d874d1425b007f2206b86eaa03bb6 - + https://github.com/dotnet/sdk - 839fb878319a8c3e741b91a3082ee05afbad7b09 + 6f240068ce0d874d1425b007f2206b86eaa03bb6 - + https://github.com/dotnet/sdk - 839fb878319a8c3e741b91a3082ee05afbad7b09 + 6f240068ce0d874d1425b007f2206b86eaa03bb6 - + https://github.com/dotnet/sdk - 839fb878319a8c3e741b91a3082ee05afbad7b09 + 6f240068ce0d874d1425b007f2206b86eaa03bb6 diff --git a/eng/Versions.props b/eng/Versions.props index 86621e3e4..3a70e4f47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.1 - 8.0.100-alpha.1.22580.1 - 8.0.100-alpha.1.22580.1 + 8.0.100-alpha.1.22580.5 + 8.0.100-alpha.1.22580.5 + 8.0.100-alpha.1.22580.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2a59f5d06822542d75cae3e3ba32322ad6a0e1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 30 Nov 2022 16:53:15 +0100 Subject: [PATCH 125/249] Add source-build patches for nuget-client's NuGet configs (#15061) --- ...ve-non-compliant-feeds-NuGet.configs.patch | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch new file mode 100644 index 000000000..f225d9a60 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch @@ -0,0 +1,88 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Premek Vysoky +Date: Wed, 30 Nov 2022 11:08:09 +0100 +Subject: [PATCH] Remove non-compliant feeds/NuGet.configs + +--- + NuGet.Config | 14 +++++++------- + submodules/Common/NuGet.config | 7 ------- + submodules/FileSystem/NuGet.config | 7 ------- + 3 files changed, 7 insertions(+), 21 deletions(-) + delete mode 100644 submodules/Common/NuGet.config + delete mode 100644 submodules/FileSystem/NuGet.config + +diff --git a/NuGet.Config b/NuGet.Config +index 0a4c87ea06..7b913598f6 100644 +--- a/NuGet.Config ++++ b/NuGet.Config +@@ -4,9 +4,9 @@ + + + +- + +- ++ ++ + + + +@@ -43,16 +43,13 @@ + + + +- ++ + + + + + +- +- +- +- ++ + + + +@@ -68,6 +65,9 @@ + + + ++ ++ ++ + + + +diff --git a/submodules/Common/NuGet.config b/submodules/Common/NuGet.config +deleted file mode 100644 +index 09c3488420..0000000000 +--- a/submodules/Common/NuGet.config ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +diff --git a/submodules/FileSystem/NuGet.config b/submodules/FileSystem/NuGet.config +deleted file mode 100644 +index 1707938c61..0000000000 +--- a/submodules/FileSystem/NuGet.config ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +\ No newline at end of file +-- +2.30.2.windows.1 + From b4f77ecac22701bf0aa17e43d4d3c3430c743efb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 08:23:43 -0800 Subject: [PATCH 126/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221129.1 (#15063) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22578.2 -> To Version 8.0.0-alpha.1.22579.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1214abda4..a686a4e4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - af8eedc4daa3d1e29af9d493f657b1927b24c957 + dd9d921db96b4469ebac73ee708cce8a31845c0c From ecb14cfee1acef34a1efef7357ee36169d2a6134 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 08:23:50 -0800 Subject: [PATCH 127/249] Update dependencies from https://github.com/dotnet/arcade build 20221129.2 (#15062) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22578.1 -> To Version 8.0.0-beta.22579.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22555.1 -> To Version 1.0.0-beta.22576.1 (parent: Microsoft.DotNet.Arcade.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a686a4e4f..cf024ec69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 3817f2b38a05c37c950715f84c95d452bcacfe52 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 3817f2b38a05c37c950715f84c95d452bcacfe52 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 3817f2b38a05c37c950715f84c95d452bcacfe52 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - 52e3661e093095cf353a4531cbfac316e487c4c0 + 9d44d854356c5ea0152b40acdef20c23bde58b03 diff --git a/eng/Versions.props b/eng/Versions.props index 24382fc64..f50bc263f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22578.1 + 8.0.0-beta.22579.2 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6586eab45..e7d1e3897 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -521,7 +521,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 10daad3f5..e8fbb1a59 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22578.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22578.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22579.2" } } From d9b467ae1478f4bf540f99eeca058dbfa84ed147 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 18:18:31 +0000 Subject: [PATCH 128/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.18 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 808b37916..4a1bf2674 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0eaf12b95e6508f6b09593e7bb553961127b4d59 + 0be32a0d12a38133b9d0096d5e1c5fabe130549a https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6f240068ce0d874d1425b007f2206b86eaa03bb6 + 0e27909c51b75b113ad13589988b8518c23b3b21 - + https://github.com/dotnet/sdk - 6f240068ce0d874d1425b007f2206b86eaa03bb6 + 0e27909c51b75b113ad13589988b8518c23b3b21 - + https://github.com/dotnet/sdk - 6f240068ce0d874d1425b007f2206b86eaa03bb6 + 0e27909c51b75b113ad13589988b8518c23b3b21 - + https://github.com/dotnet/sdk - 6f240068ce0d874d1425b007f2206b86eaa03bb6 + 0e27909c51b75b113ad13589988b8518c23b3b21 diff --git a/eng/Versions.props b/eng/Versions.props index 3a70e4f47..d14f28dfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22580.5 - 8.0.100-alpha.1.22580.5 - 8.0.100-alpha.1.22580.5 + 8.0.100-alpha.1.22580.18 + 8.0.100-alpha.1.22580.18 + 8.0.100-alpha.1.22580.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.7 - 8.0.0-alpha.1.22578.7 + 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22579.12 2.1.0 From 0f7d074e0f7254a39cb5c99c9cc47cbf5c366ff4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:41:54 -0800 Subject: [PATCH 129/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221130.1 (#15065) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22579.1 -> To Version 8.0.0-alpha.1.22580.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf024ec69..21b90cf27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - bed0fd20a5a55843c1f04ef195ef2fd7171ae715 + 4ed7440e89d5fe7d4375102a441c713fadd5357c From 8dcd4a80664ca50e062b23b051413cd2383058a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 19:14:21 +0000 Subject: [PATCH 130/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.25 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1bf2674..207368bfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0e27909c51b75b113ad13589988b8518c23b3b21 + d97f73bfce8a38e15202ee99eae786a41358a179 - + https://github.com/dotnet/sdk - 0e27909c51b75b113ad13589988b8518c23b3b21 + d97f73bfce8a38e15202ee99eae786a41358a179 - + https://github.com/dotnet/sdk - 0e27909c51b75b113ad13589988b8518c23b3b21 + d97f73bfce8a38e15202ee99eae786a41358a179 - + https://github.com/dotnet/sdk - 0e27909c51b75b113ad13589988b8518c23b3b21 + d97f73bfce8a38e15202ee99eae786a41358a179 @@ -153,9 +153,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - a9df31a0a20c15e3930336dd053487665a0f5fb9 + ee6f71d15eea77c970815d9105ab9520876c5042 diff --git a/eng/Versions.props b/eng/Versions.props index d14f28dfc..ce7b2ec50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.18 - 8.0.100-alpha.1.22580.18 - 8.0.100-alpha.1.22580.18 + 8.0.100-alpha.1.22580.25 + 8.0.100-alpha.1.22580.25 + 8.0.100-alpha.1.22580.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcfe4a62089751e48098dbe590dddc4735623b50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 20:02:16 +0000 Subject: [PATCH 131/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.26 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 207368bfc..3f558ff5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d97f73bfce8a38e15202ee99eae786a41358a179 + 415575eceff5a66210d380e1f34562a13d464d6c - + https://github.com/dotnet/sdk - d97f73bfce8a38e15202ee99eae786a41358a179 + 415575eceff5a66210d380e1f34562a13d464d6c - + https://github.com/dotnet/sdk - d97f73bfce8a38e15202ee99eae786a41358a179 + 415575eceff5a66210d380e1f34562a13d464d6c - + https://github.com/dotnet/sdk - d97f73bfce8a38e15202ee99eae786a41358a179 + 415575eceff5a66210d380e1f34562a13d464d6c diff --git a/eng/Versions.props b/eng/Versions.props index ce7b2ec50..6b37e926a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.25 - 8.0.100-alpha.1.22580.25 - 8.0.100-alpha.1.22580.25 + 8.0.100-alpha.1.22580.26 + 8.0.100-alpha.1.22580.26 + 8.0.100-alpha.1.22580.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0379484237dd2235f043dc760f89474dab1746b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 22:05:34 +0000 Subject: [PATCH 132/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.28 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f558ff5e..3ea359123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 415575eceff5a66210d380e1f34562a13d464d6c + 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 - + https://github.com/dotnet/sdk - 415575eceff5a66210d380e1f34562a13d464d6c + 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 - + https://github.com/dotnet/sdk - 415575eceff5a66210d380e1f34562a13d464d6c + 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 - + https://github.com/dotnet/sdk - 415575eceff5a66210d380e1f34562a13d464d6c + 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 diff --git a/eng/Versions.props b/eng/Versions.props index 6b37e926a..4511030b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.26 - 8.0.100-alpha.1.22580.26 - 8.0.100-alpha.1.22580.26 + 8.0.100-alpha.1.22580.28 + 8.0.100-alpha.1.22580.28 + 8.0.100-alpha.1.22580.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 31d142a7d3d37811e85eaed3bd7cc6156c3bbeec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 02:55:26 +0000 Subject: [PATCH 133/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.44 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ea359123..b0d65f1ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 + e0e866651ce7f2b0f60e7469da0cb664570e75b2 - + https://github.com/dotnet/sdk - 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 + e0e866651ce7f2b0f60e7469da0cb664570e75b2 - + https://github.com/dotnet/sdk - 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 + e0e866651ce7f2b0f60e7469da0cb664570e75b2 - + https://github.com/dotnet/sdk - 5a5e3364d262dd3cd97ee1666e52cb61ee137ac6 + e0e866651ce7f2b0f60e7469da0cb664570e75b2 diff --git a/eng/Versions.props b/eng/Versions.props index 4511030b5..cf2a7b3b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.28 - 8.0.100-alpha.1.22580.28 - 8.0.100-alpha.1.22580.28 + 8.0.100-alpha.1.22580.44 + 8.0.100-alpha.1.22580.44 + 8.0.100-alpha.1.22580.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6748cadd4f6e4c997a2bbe1bfcb6d918569b016e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 03:46:41 +0000 Subject: [PATCH 134/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.47 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0d65f1ae..2137ffda9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 - + https://github.com/dotnet/aspnetcore - 522bbeef952a78d2e0907e23391e18f0cf583a8e + 63c49481c2e0462c65443a9dc68ec156a46d4d55 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e0e866651ce7f2b0f60e7469da0cb664570e75b2 + d2eb42b9425d0a9dde984fca1f8747b69389770f - + https://github.com/dotnet/sdk - e0e866651ce7f2b0f60e7469da0cb664570e75b2 + d2eb42b9425d0a9dde984fca1f8747b69389770f - + https://github.com/dotnet/sdk - e0e866651ce7f2b0f60e7469da0cb664570e75b2 + d2eb42b9425d0a9dde984fca1f8747b69389770f - + https://github.com/dotnet/sdk - e0e866651ce7f2b0f60e7469da0cb664570e75b2 + d2eb42b9425d0a9dde984fca1f8747b69389770f @@ -142,9 +142,9 @@ a61ec9013bbadc3401a7ca3f17193d027b6ef4fe - + https://github.com/dotnet/linker - 261e91198bc9ec29f6904eff764cb65a25bd76ac + e816e7336f1737248d73d405c49f568fe1db745b linker @@ -158,9 +158,9 @@ ee6f71d15eea77c970815d9105ab9520876c5042 - + https://github.com/nuget/nuget.client - dfe13cc99d13de74f41e9cff35600a2c8958aac1 + be87c9ee11149780ce7de5fe35fe2653d565ccfd diff --git a/eng/Versions.props b/eng/Versions.props index cf2a7b3b3..d0cae5390 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 - 8.0.0-alpha.1.22579.20 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.7 0.2.0 - 8.0.100-alpha.1.22580.44 - 8.0.100-alpha.1.22580.44 - 8.0.100-alpha.1.22580.44 + 8.0.100-alpha.1.22580.47 + 8.0.100-alpha.1.22580.47 + 8.0.100-alpha.1.22580.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93ff8c2b80df9dbd5fa23683923b83f8b195592 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 06:33:57 +0000 Subject: [PATCH 135/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.55 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2137ffda9..c30975073 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d2eb42b9425d0a9dde984fca1f8747b69389770f + b26a1008cb06bf0e50282877b5a6faaee789aa80 - + https://github.com/dotnet/sdk - d2eb42b9425d0a9dde984fca1f8747b69389770f + b26a1008cb06bf0e50282877b5a6faaee789aa80 - + https://github.com/dotnet/sdk - d2eb42b9425d0a9dde984fca1f8747b69389770f + b26a1008cb06bf0e50282877b5a6faaee789aa80 - + https://github.com/dotnet/sdk - d2eb42b9425d0a9dde984fca1f8747b69389770f + b26a1008cb06bf0e50282877b5a6faaee789aa80 @@ -137,9 +137,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - a61ec9013bbadc3401a7ca3f17193d027b6ef4fe + dbdb1f6f9007a288c904aa1f13485a3e57080fb6 @@ -148,9 +148,9 @@ linker - + https://github.com/dotnet/roslyn - 2e846c4211610644773577d2aec8c584ae9412ff + ea0b6351c129c7decd9bf76f4388239509e28e0d diff --git a/eng/Versions.props b/eng/Versions.props index d0cae5390..16bb50a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.47 - 8.0.100-alpha.1.22580.47 - 8.0.100-alpha.1.22580.47 + 8.0.100-alpha.1.22580.55 + 8.0.100-alpha.1.22580.55 + 8.0.100-alpha.1.22580.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221128-04 + 17.5.0-preview-20221130-01 8.0.0-alpha.1.22557.12 From 0c5a187ead603b2d0ee400b58826265ef7961050 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 07:25:33 +0000 Subject: [PATCH 136/249] Update dependencies from https://github.com/dotnet/sdk build 20221130.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22580.58 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c30975073..ded21b897 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 - + https://github.com/dotnet/aspnetcore - 63c49481c2e0462c65443a9dc68ec156a46d4d55 + 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b26a1008cb06bf0e50282877b5a6faaee789aa80 + 0470e8134ce5ee1145fca2a433ed6dbab773db23 - + https://github.com/dotnet/sdk - b26a1008cb06bf0e50282877b5a6faaee789aa80 + 0470e8134ce5ee1145fca2a433ed6dbab773db23 - + https://github.com/dotnet/sdk - b26a1008cb06bf0e50282877b5a6faaee789aa80 + 0470e8134ce5ee1145fca2a433ed6dbab773db23 - + https://github.com/dotnet/sdk - b26a1008cb06bf0e50282877b5a6faaee789aa80 + 0470e8134ce5ee1145fca2a433ed6dbab773db23 diff --git a/eng/Versions.props b/eng/Versions.props index 16bb50a2c..bb77ce420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 - 8.0.0-alpha.1.22580.7 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22580.11 0.2.0 - 8.0.100-alpha.1.22580.55 - 8.0.100-alpha.1.22580.55 - 8.0.100-alpha.1.22580.55 + 8.0.100-alpha.1.22580.58 + 8.0.100-alpha.1.22580.58 + 8.0.100-alpha.1.22580.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87955496af2d49999de3f51e6633131bc19b6786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 1 Dec 2022 10:51:39 +0100 Subject: [PATCH 137/249] Use VMR instead of the tarball for Source-Build builds (#15042) For PRs, the Source-Build leg that was running inside of the Build stage is now moved to a separate stage but runs more or less the same: https://dev.azure.com/dnceng-public/public/_build/results?buildId=97509&view=results Instead of creating the tarball, we are building the `dotnet/dotnet` repo there. For internal rolling builds, we are taking [this pipeline](https://dev.azure.com/dnceng/internal/_build/results?buildId=2056327&view=results) and merging it into `dotnet-installer-official-ci`. So it's one extra stage that runs pretty quick (faster than the Build stage by far). It won't be creating and pushing the tarball artifact anymore though. Once the rolling build is finished, there won't be no more source-build-build pipeline but instead dotnet-dotnet-official-ci which will build the dotnet/dotnet repo again instead of the tarball that was originally produced from the rolling build. The MSFT SDK from the installer build will still be consumed by it though. More details https://github.com/dotnet/arcade/issues/10677 --- .vsts-ci.yml | 35 ++- eng/pipelines/templates/jobs/vmr-build.yml | 225 ++++++++++++++++++ .../jobs}/vmr-synchronization.yml | 57 +++-- eng/pipelines/templates/stages/vmr-build.yml | 167 +++++++++++++ eng/pipelines/templates/steps/vmr-prepare.yml | 35 ++- .../templates/steps/vmr-pull-updates.yml | 27 +-- .../templates/variables/vmr-variables.yml | 9 - eng/pipelines/vmr-ci.yml | 26 ++ eng/pipelines/vmr-validation.yml | 51 ---- eng/source-build-tarball-build-official.yml | 26 -- eng/source-build-tarball-build.yml | 14 -- .../job/source-build-build-tarball.yml | 205 ---------------- .../job/source-build-create-tarball.yml | 85 ------- .../job/source-build-run-tarball-build.yml | 121 ---------- 14 files changed, 515 insertions(+), 568 deletions(-) create mode 100644 eng/pipelines/templates/jobs/vmr-build.yml rename eng/pipelines/{ => templates/jobs}/vmr-synchronization.yml (52%) create mode 100644 eng/pipelines/templates/stages/vmr-build.yml delete mode 100644 eng/pipelines/templates/variables/vmr-variables.yml create mode 100644 eng/pipelines/vmr-ci.yml delete mode 100644 eng/pipelines/vmr-validation.yml delete mode 100644 eng/source-build-tarball-build-official.yml delete mode 100644 eng/source-build-tarball-build.yml delete mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml delete mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml delete mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 78fc837c2..1e0355974 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -10,6 +10,19 @@ trigger: - internal/release/6.* - internal/release/7.* +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to push to + type: string + default: $(Build.SourceBranchName) + variables: - name: _PublishUsingPipelines value: false @@ -345,12 +358,24 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml parameters: - dependsOn: Source_Build_Create_Tarball + vmrBranch: ${{ parameters.vmrBranch }} + +# In case the VMR Build stage needs to be temporarily disabled, please make sure that +# the VMR synchronization step is run to validate that the PR can be merged and later +# synchronized into the VMR without problems. +# You can do this by allowing the Synchronize_VMR stage from above in PRs. +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: /eng/pipelines/templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + installerBuildResourceId: current - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml new file mode 100644 index 000000000..d7337f38e --- /dev/null +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -0,0 +1,225 @@ +### This job source-builds https://github.com/dotnet/dotnet with given parameters +### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested + +parameters: + +- name: vmrPath + type: string + default: $(Agent.BuildDirectory)/vmr + +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + default: $(Build.SourceBranchName) + +# Resource id of the installer build to retrieve MSFT SDK from +- name: installerBuildResourceId + type: string + +- name: buildName + type: string + +- name: architecture + type: string + +- name: container + type: string + +- name: pool + type: object + +# Allow downloading artifacts from the internet during the build +- name: runOnline + type: boolean + +# Skip running the SDK content smoke-tests +- name: excludeSdkContentTests + type: boolean + default: false + +# Name of a previous job (from the same template as this) whose output will be used to build this job +# The SDK from its artifacts is copied to vmr/.dotnet +- name: reuseBuildArtifactsFrom + type: string + default: '' + +- name: excludeOmniSharpTests + type: boolean + +- name: bootstrapPrep + type: boolean + +- name: enablePoison + type: boolean + +jobs: +- job: ${{ parameters.buildName }}_${{ parameters.architecture }} + timeoutInMinutes: 150 + pool: ${{ parameters.pool }} + ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # The build shortcuts when stage 1 build fails and doesn't produce the SDK. + condition: succeededOrFailed() + dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }} + variables: + - template: /eng/common/templates/variables/pool-providers.yml + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBot-GitHub + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ else }}: + - name: BotAccount-dotnet-bot-repo-PAT + value: N/A + - ${{ if eq(parameters.reuseBuildArtifactsFrom, '') }}: + - name: additionalBuildArgs + value: '' + - ${{ else }}: + - name: additionalBuildArgs + value: ' --with-sdk /vmr/.dotnet' + + steps: + - template: ../steps/vmr-prepare.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + skipComponentGovernanceDetection: true + + # Synchronize new content in the VMR during PRs (we expect this to come + - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: ../steps/vmr-pull-updates.yml + parameters: + vmrPath: ${{ parameters.vmrPath }} + vmrBranch: ${{ parameters.vmrBranch }} + targetRef: $(Build.SourceVersion) # Synchronize the current installer commit + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - script: cp ${{ parameters.vmrPath }}/src/installer/NuGet.config ${{ parameters.vmrPath }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: ${{ parameters.vmrPath }}/src/installer/eng/common/SetupNugetSources.sh + arguments: ${{ parameters.vmrPath }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT SDK + + - ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: + - download: current + artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts + patterns: '*.tar.gz' + displayName: Download Previous Build + + - task: CopyFiles@2 + displayName: Copy Previous Build + inputs: + SourceFolder: $(Pipeline.Workspace)/${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts + Contents: '*.tar.gz' + TargetFolder: ${{ parameters.vmrPath }}/packages/archive/ + + - script: | + set -x + + if [[ -z '${{ parameters.reuseBuildArtifactsFrom }}' ]]; then + customPrepArgs= + if [[ '${{ parameters.bootstrapPrep }}' == 'True' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v ${{ parameters.vmrPath }}:/vmr -w /vmr ${{ parameters.container }} ./prep.sh ${customPrepArgs} + else + mkdir ${{ parameters.vmrPath }}/.dotnet + previousSdkPath="${{ parameters.vmrPath }}/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$previousSdkPath" -C "${{ parameters.vmrPath }}/.dotnet" + eval rm -f "$previousSdkPath" + fi + displayName: Prep the Build + + - script: | + set -x + df -h + + networkArgs= + customBuildArgs= + if [[ '${{ parameters.runOnline }}' == 'True' ]]; then + customBuildArgs='--online' + else + networkArgs='--network none' + fi + + if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v ${{ parameters.vmrPath }}:/vmr -w /vmr ${networkArgs} ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) ${customBuildArgs} + displayName: Build + + - script: | + set -x + + dockerVolumeArgs="-v ${{ parameters.vmrPath }}:/vmr" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests }} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests }}' != 'True' ]]; then + dockerVolumeArgs+=" -v $(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + msftSdkTarballName=$(find "$(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /vmr $dockerEnvArgs ${{ parameters.container }} ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "${{ parameters.vmrPath }}" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: ${{ parameters.vmrPath }} + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '${{ parameters.vmrPath }}/artifacts/${{ parameters.architecture }}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/eng/pipelines/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml similarity index 52% rename from eng/pipelines/vmr-synchronization.yml rename to eng/pipelines/templates/jobs/vmr-synchronization.yml index cf624ab12..012b804a0 100644 --- a/eng/pipelines/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -1,8 +1,9 @@ -### This pipeline synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet) +### This job synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet) +### It synchronizes the content of the VMR to this new commit and pushes the changes parameters: - name: targetRef - displayName: Target revision in dotnet/installer to synchronize to + displayName: Target revision of dotnet/installer to synchronize type: string default: $(Build.SourceVersion) @@ -16,53 +17,42 @@ parameters: type: boolean default: false -trigger: - branches: - include: - - main - - release/* - - internal/release/* - -pr: none - -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - -variables: -- template: /eng/common/templates/variables/pool-providers.yml -- template: templates/variables/vmr-variables.yml - jobs: -- job: Synchronize +- job: Synchronize_VMR displayName: Synchronize dotnet/dotnet timeoutInMinutes: 120 + variables: + - template: /eng/common/templates/variables/pool-providers.yml + - name: vmrPath + value: $(Agent.BuildDirectory)/vmr + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBot-GitHub + - ${{ else }}: + - name: BotAccount-dotnet-bot-repo-PAT + value: N/A pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open - ${{ else }}: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 steps: - - template: templates/steps/vmr-prepare.yml + - template: ../steps/vmr-prepare.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} - - template: templates/steps/vmr-pull-updates.yml + - template: ../steps/vmr-pull-updates.yml parameters: vmrPath: $(vmrPath) vmrBranch: ${{ parameters.vmrBranch }} targetRef: ${{ parameters.targetRef }} - vmrToken: $(BotAccount-dotnet-bot-repo-PAT) - - ${{ if and(not(parameters.noPush), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: - - script: |- + # For official builds, push the changes to the VMR + - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: + - script: | set -x git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' git remote add dotnet 'https://$(BotAccount-dotnet-bot-repo-PAT)@github.com/dotnet/dotnet.git' @@ -70,5 +60,14 @@ jobs: git branch ${{ parameters.vmrBranch }} git branch --set-upstream-to=dotnet/${{ parameters.vmrBranch }} ${{ parameters.vmrBranch }} || echo 'Branch ${{ parameters.vmrBranch }} not found in remote' git push dotnet ${{ parameters.vmrBranch }} + + # Export the SHA as an artifact to be reused by the official VMR build + sha=`git rev-parse HEAD` + mkdir -p "$(Build.ArtifactStagingDirectory)/VmrRevision" + echo $sha > "$(Build.ArtifactStagingDirectory)/VmrRevision/VmrRevision.txt" displayName: Push changes to dotnet/dotnet workingDirectory: $(vmrPath) + + - publish: $(Build.ArtifactStagingDirectory)/VmrRevision + artifact: VmrRevision + displayName: Publish new SHA diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml new file mode 100644 index 000000000..4a3db6eaf --- /dev/null +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -0,0 +1,167 @@ +### This stage source-builds https://github.com/dotnet/dotnet with varying parameters +### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested + +parameters: + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # Branch of the VMR to use (to push to for internal builds) + vmrBranch: $(Build.SourceBranchName) + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + + # Internal builds + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + + # Public builds / PRs + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +stages: +- stage: VMR_Source_Build + displayName: VMR Source-Build + dependsOn: [] + variables: + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: defaultPoolName + value: ${{ parameters.poolPublicAmd64.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolPublicAmd64.demands }} + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - name: defaultPoolName + value: ${{ parameters.poolInternalAmd64PR.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolInternalAmd64PR.demands }} + - ${{ else }}: + - name: defaultPoolName + value: ${{ parameters.poolInternalAmd64.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolInternalAmd64.demands }} + + jobs: + - template: ../jobs/vmr-build.yml + parameters: + buildName: CentOSStream8_Online + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.centOSStream8Container }} + bootstrapPrep: false # 🚫 + enablePoison: false # 🚫 + excludeSdkContentTests: true # ✅ + excludeOmniSharpTests: true # ✅ + runOnline: true # ✅ + + - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: ../jobs/vmr-build.yml + parameters: + buildName: CentOSStream8_Offline + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.centOSStream8Container }} + bootstrapPrep: false # 🚫 + enablePoison: false # 🚫 + excludeSdkContentTests: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: false # 🚫 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: CentOSStream9_Offline + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.centOSStream9Container }} + bootstrapPrep: false # 🚫 + enablePoison: false # 🚫 + excludeSdkContentTests: false # 🚫 + excludeOmniSharpTests: false # 🚫 + runOnline: false # 🚫 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Fedora36_Offline + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.fedora36Container }} + bootstrapPrep: false # 🚫 + enablePoison: true # ✅ + excludeSdkContentTests: false # 🚫 + excludeOmniSharpTests: false # 🚫 + runOnline: false # 🚫 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Ubuntu2004_Offline + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.ubuntu2004Container }} + bootstrapPrep: false # 🚫 + enablePoison: false # 🚫 + excludeSdkContentTests: false # 🚫 + excludeOmniSharpTests: false # 🚫 + runOnline: false # 🚫 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Debian11_Offline + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: arm64 + pool: ${{ parameters.poolInternalArm64 }} + container: ${{ parameters.debian11Arm64Container }} + bootstrapPrep: true # ✅ + enablePoison: false # 🚫 + excludeSdkContentTests: false # 🚫 + excludeOmniSharpTests: false # 🚫 + runOnline: false # 🚫 + + - template: ../jobs/vmr-build.yml + parameters: + buildName: Fedora36_Offline_Using_Previous + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + vmrBranch: ${{ parameters.vmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.fedora36Container }} + bootstrapPrep: false # 🚫 + enablePoison: false # 🚫 + excludeSdkContentTests: true # ✅ + excludeOmniSharpTests: false # 🚫 + runOnline: false # 🚫 + reuseBuildArtifactsFrom: Fedora36_Offline diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 5a18630f9..2786cbfad 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -7,21 +7,42 @@ parameters: type: string default: $(Build.SourceBranchName) +- name: installerBuildResourceId + displayName: Installer build to get the commit hash to check out from + type: string + default: current + +- name: skipComponentGovernanceDetection + type: boolean + default: false + steps: - checkout: vmr - clean: true displayName: Clone dotnet/dotnet - fetchDepth: 0 path: vmr + clean: true + fetchDepth: 0 # We need this so that we can check out the new commit -- script: | - git switch -c ${{ parameters.vmrBranch }} - displayName: Checkout ${{ parameters.vmrBranch }} - workingDirectory: $(Agent.BuildDirectory)/vmr +- ${{ if ne(parameters.installerBuildResourceId, 'current') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: VmrRevision + displayName: Download VmrRevision + + - script: | + set -ex + sha=`head -n 1 $(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/VmrRevision/VmrRevision.txt` + git checkout $sha + displayName: Check out dotnet/dotnet commit + workingDirectory: $(Agent.BuildDirectory)/vmr +- ${{ else }}: + - script: | + git switch -c ${{ parameters.vmrBranch }} + displayName: Checkout ${{ parameters.vmrBranch }} + workingDirectory: $(Agent.BuildDirectory)/vmr # TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG? # Currently, we ignore dirs of individual repos - they have been scanned before -- ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: +- ${{ if and(not(parameters.skipComponentGovernanceDetection), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}: - task: ComponentGovernanceComponentDetection@0 inputs: sourceScanPath: $(Agent.BuildDirectory)/vmr diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 960f58975..0fb3ca76d 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -12,10 +12,6 @@ parameters: type: string default: $(Build.SourceVersion) -- name: vmrToken - displayName: PAT that allows pushing to dotnet/dotnet - type: string - - name: vmrPath displayName: Path where the dotnet/dotnet is checked out to type: string @@ -23,9 +19,7 @@ parameters: steps: - checkout: self - clean: true displayName: Clone dotnet/installer - fetchDepth: 0 path: installer - script: | @@ -37,22 +31,23 @@ steps: - script: git checkout -B ${{ parameters.vmrBranch }} displayName: Prepare branch ${{ parameters.vmrBranch }} - workingDirectory: $(vmrPath) + workingDirectory: ${{ parameters.vmrPath }} -# TODO (https://github.com/dotnet/arcade/issues/11386): Remove this step -# This step is here so that darc can find the PR commit (which might be in some fork) -# We need to make darc understand that it needs to look in the fork from this PR -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - script: | - cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/03298978DFFFCD23 - displayName: Prepare dotnet/installer clone +# This step make sure that darc finds the PR commit (which might be in a fork of installer) +# The cloned folder does have the commit so we copy it into temp where the tooling will find it +# We also cannot keep the AzDO remote as pulling from it would require a token +- script: | + cp -r $(Agent.BuildDirectory)/installer $(Agent.TempDirectory)/03298978DFFFCD23 + cd $(Agent.TempDirectory)/03298978DFFFCD23 + git remote remove origin + git remote add origin https://github.com/dotnet/installer + displayName: Prepare dotnet/installer clone - script: > $(Agent.BuildDirectory)/installer/.dotnet/dotnet darc vmr update --vmr ${{ parameters.vmrPath }} --tmp $(Agent.TempDirectory) - --azdev-pat $(System.AccessToken) - --github-pat ${{ parameters.vmrToken }} + --github-pat $(BotAccount-dotnet-bot-repo-PAT) --recursive --verbose installer:${{ parameters.targetRef }} diff --git a/eng/pipelines/templates/variables/vmr-variables.yml b/eng/pipelines/templates/variables/vmr-variables.yml deleted file mode 100644 index 0d6af8fff..000000000 --- a/eng/pipelines/templates/variables/vmr-variables.yml +++ /dev/null @@ -1,9 +0,0 @@ -variables: -- name: vmrPath - value: $(Agent.BuildDirectory)/vmr - -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBot-GitHub -- ${{ else }}: - - name: BotAccount-dotnet-bot-repo-PAT - value: N/A \ No newline at end of file diff --git a/eng/pipelines/vmr-ci.yml b/eng/pipelines/vmr-ci.yml new file mode 100644 index 000000000..3d76618ab --- /dev/null +++ b/eng/pipelines/vmr-ci.yml @@ -0,0 +1,26 @@ +trigger: none +pr: none +resources: + pipelines: + - pipeline: installer-build-resource + source: dotnet-installer-official-ci + trigger: + branches: + include: + - main + - release/* + - internal/release/* + stages: + - Build + - VMR_Synchronization + + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +stages: +- template: /eng/pipelines/templates/stages/vmr-build.yml + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/pipelines/vmr-validation.yml b/eng/pipelines/vmr-validation.yml deleted file mode 100644 index bdd0bbd31..000000000 --- a/eng/pipelines/vmr-validation.yml +++ /dev/null @@ -1,51 +0,0 @@ -### This pipeline validates new changes of the VMR (https://github.com/dotnet/dotnet) -### VMR is cloned and updates are applied locally - -parameters: -- name: vmrBranch - displayName: dotnet/dotnet branch to use - type: string - default: $(System.PullRequest.TargetBranch) - -trigger: none - -pr: - branches: - include: - - main - - release/* - - internal/release/* - -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: public - -variables: -- template: /eng/common/templates/variables/pool-providers.yml -- template: templates/variables/vmr-variables.yml - -jobs: -- job: Validate - displayName: Test VMR synchronization - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 - - steps: - - template: templates/steps/vmr-prepare.yml - parameters: - vmrBranch: ${{ parameters.vmrBranch }} - - - template: templates/steps/vmr-pull-updates.yml - parameters: - vmrPath: $(vmrPath) - vmrBranch: ${{ parameters.vmrBranch }} - targetRef: $(Build.SourceVersion) - vmrToken: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml deleted file mode 100644 index 5d396baab..000000000 --- a/eng/source-build-tarball-build-official.yml +++ /dev/null @@ -1,26 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: dotnet-installer-official-ci - trigger: - branches: - include: - - main - - release/* - - internal/release/* - exclude: - - release/6.0.3xx - - internal/release/6.0.3xx - - release/6.0.4xx - - internal/release/6.0.4xx - stages: - - build - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml deleted file mode 100644 index 042bb7349..000000000 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ /dev/null @@ -1,205 +0,0 @@ -# Builds a source-build tarball - -parameters: - # Architecture to build - architecture: - - # Custom condition to apply to the job - condition: - - # Dependent jobs that must be completed before this job will run - dependsOn: - - # Skip running the SDK content smoke-tests - excludeSdkContentTests: false - - # Resource id of the installer build to retrieve source/product tarball's from - installerBuildResourceId: - - # Matrix to run jobs over - matrix: - - # Job name - name: - - # Agent pool to use - pool: - - # Build using the previous source-build artifacts - usePreviousArtifacts: false - -jobs: -- job: ${{ parameters.name }} - condition: ${{ parameters.condition }} - dependsOn: ${{ parameters.dependsOn }} - pool: ${{ parameters.pool }} - strategy: - matrix: ${{ parameters.matrix }} - timeoutInMinutes: 300 - variables: - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - group: AzureDevOps-Artifact-Feeds-Pats - - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: - - name: additionalBuildArgs - value: --with-sdk /tarball/.dotnet - - name: tarballDir - value: $(Build.StagingDirectory)/tarball - workspace: - clean: all - - steps: - - checkout: self - clean: true - - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - - download: ${{ parameters.installerBuildResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Source Tarball - - - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - - download: ${{ parameters.installerBuildResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' - displayName: Download MSFT sdk Tarball - - - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: - - download: current - artifact: $(_PreviousSourceBuildArtifact) - patterns: '*.tar.gz' - displayName: Download Previous Source Build Artifacts - - - task: CopyFiles@2 - displayName: Copy Previous Source Build Artifacts - inputs: - SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) - Contents: '*.tar.gz' - TargetFolder: $(tarballDir)/packages/archive/ - - - script: | - set -x - - resourceIdPathSegment= - if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then - resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' - fi - - mkdir -p "$(tarballDir)" - tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" - eval rm -f "$tarballFilePath" - displayName: Extract Tarball - - - script: | - set -x - - if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then - customPrepArgs= - if [[ '$(_BootstrapPrep)' == 'true' ]]; then - customPrepArgs='--bootstrap' - fi - - docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} - else - mkdir $(tarballDir)/.dotnet - tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" - eval rm -f "$tarballFilePath" - fi - displayName: Prep Tarball - - - script: | - set -x - df -h - - networkArgs= - customBuildArgs= - if [[ '$(_RunOnline)' == 'true' ]]; then - customBuildArgs='--online' - else - networkArgs='--network none' - fi - - if [[ '$(_EnablePoison)' == 'true' ]]; then - customBuildArgs="$customBuildArgs --poison" - fi - - docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) - displayName: Build Tarball - - - script: | - set -x - - # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - - dockerVolumeArgs="-v $(tarballDir):/tarball" - dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" - poisonArg='' - - if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then - dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) - dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" - fi - - if [[ '$(_EnablePoison)' == 'true' ]]; then - poisonArg='--poison' - dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" - fi - - docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed - displayName: Run Tests - - # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. - - script: | - set -x - - targetFolder=$(Build.StagingDirectory)/BuildLogs/ - mkdir -p ${targetFolder} - - cd "$(tarballDir)" - find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; - find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; - find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; - find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; - find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; - find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; - find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; - find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; - displayName: Prepare BuildLogs staging directory - continueOnError: true - condition: succeededOrFailed() - - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - displayName: Publish BuildLogs - continueOnError: true - condition: succeededOrFailed() - - - task: PublishTestResults@2 - displayName: Publish Test Results - condition: succeededOrFailed() - continueOnError: true - inputs: - testRunner: vSTest - testResultsFiles: 'test/**/*.trx' - searchFolder: $(tarballDir) - mergeTestResults: true - publishRunAttachments: true - testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts - displayName: Publish Artifacts - condition: succeededOrFailed() - continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml deleted file mode 100644 index acdfe5901..000000000 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ /dev/null @@ -1,85 +0,0 @@ -# Creates a source-build tarball - -jobs: -- job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 - displayName: Source-Build Create Tarball - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ else }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - ${{ else }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - - variables: - - name: _BuildConfig - value: Release - - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNet-Source-Build-All-Orgs-Source-Access - workspace: - clean: all - - steps: - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - script: | - set -x - df -h - - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - - # If building on the internal project, the internal storage variable may be available (usually only if needed) - # In that case, add variables to allow the download of internal runtimes if the specified versions are not found - # in the default public locations. - internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' - fi - - ./build.sh \ - --ci \ - --configuration $(_BuildConfig) \ - --publish \ - -bl \ - $officialBuildArgs \ - $internalRuntimeDownloadArgs \ - /p:DotNetPublishUsingPipelines=true \ - /p:ArcadeBuildTarball=true \ - /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) - displayName: Create Tarball - - - task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - Contents: | - **/*.log - **/*.binlog - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - displayName: Publish BuildLogs - continueOnError: true - condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml deleted file mode 100644 index c794bbc8f..000000000 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ /dev/null @@ -1,121 +0,0 @@ -# Builds a source-build tarball - -parameters: - # Dependent jobs that must be completed before this job will run - dependsOn: - - # Resource id of the installer build to retrieve source/product tarball's from - installerBuildResourceId: current - - # The following parameters aren't expected to be passed in rather they are used for encapsulation - # ----------------------------------------------------------------------------------------------- - centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 - fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 - ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 - poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - poolInternalAmd64PR: - name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - poolInternalArm64: - name: Docker-Linux-Arm-Internal - poolPublicAmd64: - name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - -jobs: -- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - dependsOn: ${{ parameters.dependsOn }} - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - excludeSdkContentTests: true - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} - matrix: - CentOSStream8-Online: - _BootstrapPrep: false - _Container: ${{ parameters.centOSStream8Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: true - _RunOnline: true - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOSStream8-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOSStream8Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: true - _RunOnline: false - CentOSStream9-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOSStream9Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - Fedora36-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.fedora36Container }} - _EnablePoison: true - _ExcludeOmniSharpTests: false - _RunOnline: false - Ubuntu2004-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.ubuntu2004Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - ${{ parameters.poolPublicAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - ${{ parameters.poolInternalAmd64PR }} - ${{ else }}: - ${{ parameters.poolInternalAmd64 }} - -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: arm64 - dependsOn: ${{ parameters.dependsOn }} - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - excludeSdkContentTests: true - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} - matrix: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Debian11-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_arm64 - pool: ${{ parameters.poolInternalArm64 }} - -- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. - # The bootstrap build will shortcut if the stage 1 build failed. - condition: succeededOrFailed() - dependsOn: Build_Tarball_x64 - excludeSdkContentTests: true - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} - matrix: - Fedora36-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora36-Offline_Artifacts - _Container: ${{ parameters.fedora36Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64_Using_Previous - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - ${{ parameters.poolPublicAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ parameters.poolInternalAmd64 }} - usePreviousArtifacts: true From 3b7a642e1484ff070a3a5d5eb26cddb115c75ce0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 09:23:34 -0600 Subject: [PATCH 138/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221130.1 (#15075) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22579.1 -> To Version 8.0.0-alpha.1.22580.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21b90cf27..64f941ed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - dd9d921db96b4469ebac73ee708cce8a31845c0c + fd96997313778d5e9750d55cbb580e05bcc38465 From 5fcc934f4508a9a55c9206e24dbee04470df6353 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 1 Dec 2022 16:31:55 +0000 Subject: [PATCH 139/249] Remove unnecessary nuget patch --- ...ve-non-compliant-feeds-NuGet.configs.patch | 88 ------------------- 1 file changed, 88 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch deleted file mode 100644 index f225d9a60..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Premek Vysoky -Date: Wed, 30 Nov 2022 11:08:09 +0100 -Subject: [PATCH] Remove non-compliant feeds/NuGet.configs - ---- - NuGet.Config | 14 +++++++------- - submodules/Common/NuGet.config | 7 ------- - submodules/FileSystem/NuGet.config | 7 ------- - 3 files changed, 7 insertions(+), 21 deletions(-) - delete mode 100644 submodules/Common/NuGet.config - delete mode 100644 submodules/FileSystem/NuGet.config - -diff --git a/NuGet.Config b/NuGet.Config -index 0a4c87ea06..7b913598f6 100644 ---- a/NuGet.Config -+++ b/NuGet.Config -@@ -4,9 +4,9 @@ - - - -- - -- -+ -+ - - - -@@ -43,16 +43,13 @@ - - - -- -+ - - - - - -- -- -- -- -+ - - - -@@ -68,6 +65,9 @@ - - - -+ -+ -+ - - - -diff --git a/submodules/Common/NuGet.config b/submodules/Common/NuGet.config -deleted file mode 100644 -index 09c3488420..0000000000 ---- a/submodules/Common/NuGet.config -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/submodules/FileSystem/NuGet.config b/submodules/FileSystem/NuGet.config -deleted file mode 100644 -index 1707938c61..0000000000 ---- a/submodules/FileSystem/NuGet.config -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- -- -- -- -- -\ No newline at end of file --- -2.30.2.windows.1 - From b96a87bedb1463712770658d4c8b13ad8899c675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 16:39:07 +0000 Subject: [PATCH 140/249] [main] Update dependencies from dotnet/emsdk dotnet/arcade-services (#15074) [main] Update dependencies from dotnet/emsdk dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9b7781bef..21dbdc87f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22578.1", + "version": "1.1.0-beta.22601.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64f941ed6..5456a2f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96351a7e97093d88eb097b4a489f949ebf8a901b + 2039a62eeb52e1288f0b4aa6f71baae8f99a6f5b - + https://github.com/dotnet/emsdk - 96351a7e97093d88eb097b4a489f949ebf8a901b + 2039a62eeb52e1288f0b4aa6f71baae8f99a6f5b https://github.com/dotnet/deployment-tools @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade-services - a1e2957fadc434c33a83fcf6a4e04ce6f231ee6b + 7706f3fc349838553a94c3b0d84060b50c47d514 - + https://github.com/dotnet/arcade-services - a1e2957fadc434c33a83fcf6a4e04ce6f231ee6b + 7706f3fc349838553a94c3b0d84060b50c47d514 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f50bc263f..2eca29ea8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22578.1 + 1.1.0-beta.22601.1 @@ -221,8 +221,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22558.2 - 8.0.0-alpha.1.22558.2 + 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22578.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From e86cb73e4fcd662b55e8f258df319fd60ce800ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 16:59:20 +0000 Subject: [PATCH 141/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f2e490b0..906d7b78f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0470e8134ce5ee1145fca2a433ed6dbab773db23 + 6379d12ab8ae74039b3c791f9056265119d5efec - + https://github.com/dotnet/sdk - 0470e8134ce5ee1145fca2a433ed6dbab773db23 + 6379d12ab8ae74039b3c791f9056265119d5efec - + https://github.com/dotnet/sdk - 0470e8134ce5ee1145fca2a433ed6dbab773db23 + 6379d12ab8ae74039b3c791f9056265119d5efec - + https://github.com/dotnet/sdk - 0470e8134ce5ee1145fca2a433ed6dbab773db23 + 6379d12ab8ae74039b3c791f9056265119d5efec @@ -137,9 +137,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - dbdb1f6f9007a288c904aa1f13485a3e57080fb6 + 110858a4ed4362ad8c254339ef6502d9802e1147 diff --git a/eng/Versions.props b/eng/Versions.props index ac6f2635f..3c1c1e9c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22580.58 - 8.0.100-alpha.1.22580.58 - 8.0.100-alpha.1.22580.58 + 8.0.100-alpha.1.22601.5 + 8.0.100-alpha.1.22601.5 + 8.0.100-alpha.1.22601.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221130-01 + 17.5.0-preview-20221201-01 8.0.0-alpha.1.22557.12 From 45011cd322b3143ed668683d23164ce5c79570f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 18:02:27 +0000 Subject: [PATCH 142/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 906d7b78f..551d2fbcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6379d12ab8ae74039b3c791f9056265119d5efec + 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b - + https://github.com/dotnet/sdk - 6379d12ab8ae74039b3c791f9056265119d5efec + 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b - + https://github.com/dotnet/sdk - 6379d12ab8ae74039b3c791f9056265119d5efec + 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b - + https://github.com/dotnet/sdk - 6379d12ab8ae74039b3c791f9056265119d5efec + 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b diff --git a/eng/Versions.props b/eng/Versions.props index 3c1c1e9c9..c490ecf7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22601.5 - 8.0.100-alpha.1.22601.5 - 8.0.100-alpha.1.22601.5 + 8.0.100-alpha.1.22601.9 + 8.0.100-alpha.1.22601.9 + 8.0.100-alpha.1.22601.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ee1333d1a2b93cc9fbd0cbead34cca0c1d2a2d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 19:08:38 +0000 Subject: [PATCH 143/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 551d2fbcd..bc58d4818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b + c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 - + https://github.com/dotnet/sdk - 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b + c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 - + https://github.com/dotnet/sdk - 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b + c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 - + https://github.com/dotnet/sdk - 81c8b24c3d2dc4fb98287cb3122e386770b4eb4b + c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a + 53f907e84e36a56e68e76fcc3aa5c12540363345 - + https://github.com/dotnet/fsharp - 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a + 53f907e84e36a56e68e76fcc3aa5c12540363345 diff --git a/eng/Versions.props b/eng/Versions.props index c490ecf7b..6255802d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22601.9 - 8.0.100-alpha.1.22601.9 - 8.0.100-alpha.1.22601.9 + 8.0.100-alpha.1.22601.20 + 8.0.100-alpha.1.22601.20 + 8.0.100-alpha.1.22601.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e5b93946ba6bb935d0662ff4d1567b79e646ad6 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 1 Dec 2022 13:09:59 -0600 Subject: [PATCH 144/249] Remove nuget source-build patch (#15079) --- ...ve-non-compliant-feeds-NuGet.configs.patch | 88 ------------------- 1 file changed, 88 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch deleted file mode 100644 index f225d9a60..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-non-compliant-feeds-NuGet.configs.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Premek Vysoky -Date: Wed, 30 Nov 2022 11:08:09 +0100 -Subject: [PATCH] Remove non-compliant feeds/NuGet.configs - ---- - NuGet.Config | 14 +++++++------- - submodules/Common/NuGet.config | 7 ------- - submodules/FileSystem/NuGet.config | 7 ------- - 3 files changed, 7 insertions(+), 21 deletions(-) - delete mode 100644 submodules/Common/NuGet.config - delete mode 100644 submodules/FileSystem/NuGet.config - -diff --git a/NuGet.Config b/NuGet.Config -index 0a4c87ea06..7b913598f6 100644 ---- a/NuGet.Config -+++ b/NuGet.Config -@@ -4,9 +4,9 @@ - - - -- - -- -+ -+ - - - -@@ -43,16 +43,13 @@ - - - -- -+ - - - - - -- -- -- -- -+ - - - -@@ -68,6 +65,9 @@ - - - -+ -+ -+ - - - -diff --git a/submodules/Common/NuGet.config b/submodules/Common/NuGet.config -deleted file mode 100644 -index 09c3488420..0000000000 ---- a/submodules/Common/NuGet.config -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/submodules/FileSystem/NuGet.config b/submodules/FileSystem/NuGet.config -deleted file mode 100644 -index 1707938c61..0000000000 ---- a/submodules/FileSystem/NuGet.config -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- -- -- -- -- -\ No newline at end of file --- -2.30.2.windows.1 - From 74a9ab50882d4422c0ff0c35dc3dfcad02974001 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 21:34:08 +0000 Subject: [PATCH 145/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.27 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e150c520..a23f849ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 + b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a - + https://github.com/dotnet/sdk - c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 + b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a - + https://github.com/dotnet/sdk - c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 + b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a - + https://github.com/dotnet/sdk - c487f3ec76d2c4cfa64e36a5a6fc801d07c893b5 + b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a diff --git a/eng/Versions.props b/eng/Versions.props index 9ed2ff7e1..c2921f484 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22601.20 - 8.0.100-alpha.1.22601.20 - 8.0.100-alpha.1.22601.20 + 8.0.100-alpha.1.22601.27 + 8.0.100-alpha.1.22601.27 + 8.0.100-alpha.1.22601.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83b58d7c820d2c5ced0fa0f17e7627d07625eed9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 22:25:54 +0000 Subject: [PATCH 146/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.29 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a23f849ab..dce0fac1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 - + https://github.com/dotnet/aspnetcore - 33e2bca8af250a5e9d31060cbe14bbbda23ce3a7 + df7c53ceaabef84ad2260f4fc8c68264718e1da1 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a + c163fc945efbf40d045381295b75369d9c4d79c8 - + https://github.com/dotnet/sdk - b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a + c163fc945efbf40d045381295b75369d9c4d79c8 - + https://github.com/dotnet/sdk - b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a + c163fc945efbf40d045381295b75369d9c4d79c8 - + https://github.com/dotnet/sdk - b34eaaacc0f5c4f3e9acdc7d501556dc80a70a8a + c163fc945efbf40d045381295b75369d9c4d79c8 diff --git a/eng/Versions.props b/eng/Versions.props index c2921f484..5baae7334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 - 8.0.0-alpha.1.22580.11 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.5 0.2.0 - 8.0.100-alpha.1.22601.27 - 8.0.100-alpha.1.22601.27 - 8.0.100-alpha.1.22601.27 + 8.0.100-alpha.1.22601.29 + 8.0.100-alpha.1.22601.29 + 8.0.100-alpha.1.22601.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc7d7bf65d325c5d5fc05734e45958dc894ef4f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 03:04:18 +0000 Subject: [PATCH 147/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.37 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22579.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dce0fac1a..0e96f25d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 0be32a0d12a38133b9d0096d5e1c5fabe130549a - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 - + https://github.com/dotnet/aspnetcore - df7c53ceaabef84ad2260f4fc8c68264718e1da1 + 600eb9aa53c052ec7327e2399744215dbe493a89 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c163fc945efbf40d045381295b75369d9c4d79c8 + 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e - + https://github.com/dotnet/sdk - c163fc945efbf40d045381295b75369d9c4d79c8 + 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e - + https://github.com/dotnet/sdk - c163fc945efbf40d045381295b75369d9c4d79c8 + 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e - + https://github.com/dotnet/sdk - c163fc945efbf40d045381295b75369d9c4d79c8 + 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e diff --git a/eng/Versions.props b/eng/Versions.props index 5baae7334..eee8856db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 - 8.0.0-alpha.1.22601.5 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22601.15 0.2.0 - 8.0.100-alpha.1.22601.29 - 8.0.100-alpha.1.22601.29 - 8.0.100-alpha.1.22601.29 + 8.0.100-alpha.1.22601.37 + 8.0.100-alpha.1.22601.37 + 8.0.100-alpha.1.22601.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db8d3b38861b1448fdb2a3e26d823d513048eb9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 06:34:50 +0000 Subject: [PATCH 148/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.39 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22580.16 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e96f25d2..80d691fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0be32a0d12a38133b9d0096d5e1c5fabe130549a + 39b6e5e5eb552af4e9c509a4b55362776771c89d https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e + 5859a2c5df3d7cdef1cecf7e420de576d03f52ba - + https://github.com/dotnet/sdk - 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e + 5859a2c5df3d7cdef1cecf7e420de576d03f52ba - + https://github.com/dotnet/sdk - 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e + 5859a2c5df3d7cdef1cecf7e420de576d03f52ba - + https://github.com/dotnet/sdk - 6d986f7e55b29cf80fb5fdf34099a642a2b8de7e + 5859a2c5df3d7cdef1cecf7e420de576d03f52ba diff --git a/eng/Versions.props b/eng/Versions.props index eee8856db..808a0c129 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22601.37 - 8.0.100-alpha.1.22601.37 - 8.0.100-alpha.1.22601.37 + 8.0.100-alpha.1.22601.39 + 8.0.100-alpha.1.22601.39 + 8.0.100-alpha.1.22601.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22579.12 - 8.0.0-alpha.1.22579.12 + 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22580.16 2.1.0 From 16facb71fa951f091351f473c353596af58647f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 08:27:03 +0000 Subject: [PATCH 149/249] Update dependencies from https://github.com/dotnet/sdk build 20221201.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22601.41 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22580.16 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80d691fa3..f65d8e91c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5859a2c5df3d7cdef1cecf7e420de576d03f52ba + 362bb0471fe51869daa7f65f75eb7e52538a92a7 - + https://github.com/dotnet/sdk - 5859a2c5df3d7cdef1cecf7e420de576d03f52ba + 362bb0471fe51869daa7f65f75eb7e52538a92a7 - + https://github.com/dotnet/sdk - 5859a2c5df3d7cdef1cecf7e420de576d03f52ba + 362bb0471fe51869daa7f65f75eb7e52538a92a7 - + https://github.com/dotnet/sdk - 5859a2c5df3d7cdef1cecf7e420de576d03f52ba + 362bb0471fe51869daa7f65f75eb7e52538a92a7 diff --git a/eng/Versions.props b/eng/Versions.props index 808a0c129..dba60c290 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22601.39 - 8.0.100-alpha.1.22601.39 - 8.0.100-alpha.1.22601.39 + 8.0.100-alpha.1.22601.41 + 8.0.100-alpha.1.22601.41 + 8.0.100-alpha.1.22601.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1bf47582413b9246a5fb59913269deaf3b62eb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 13:05:54 +0000 Subject: [PATCH 150/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22580.16 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f65d8e91c..7ac31a1fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 362bb0471fe51869daa7f65f75eb7e52538a92a7 + dc776c147ea77a7ec036e1dcfe3004612beba964 - + https://github.com/dotnet/sdk - 362bb0471fe51869daa7f65f75eb7e52538a92a7 + dc776c147ea77a7ec036e1dcfe3004612beba964 - + https://github.com/dotnet/sdk - 362bb0471fe51869daa7f65f75eb7e52538a92a7 + dc776c147ea77a7ec036e1dcfe3004612beba964 - + https://github.com/dotnet/sdk - 362bb0471fe51869daa7f65f75eb7e52538a92a7 + dc776c147ea77a7ec036e1dcfe3004612beba964 diff --git a/eng/Versions.props b/eng/Versions.props index dba60c290..8a0438559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22601.41 - 8.0.100-alpha.1.22601.41 - 8.0.100-alpha.1.22601.41 + 8.0.100-alpha.1.22602.1 + 8.0.100-alpha.1.22602.1 + 8.0.100-alpha.1.22602.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 243326d8d19c03876ba6a037fcddfb7ebe8b0b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 2 Dec 2022 15:12:56 +0100 Subject: [PATCH 151/249] Add instructions to build using Docker into VMR's README (#15073) Co-authored-by: Michael Simons --- .../content/eng/bootstrap/README.template.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md index 3393b82b3..d092f1f4f 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md +++ b/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md @@ -75,6 +75,7 @@ For the latest information about Source-Build support, please watch for announce ### Prerequisites The dependencies for building .NET from source can be found [here](https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/linux-requirements.md). +In case you don't want to / cannot prepare your environment per the requirements, consider [using Docker](#building-using-docker). ### Building @@ -110,7 +111,7 @@ The dependencies for building .NET from source can be found [here](https://githu ```bash mkdir -p $HOME/dotnet - tar zxf artifacts/x64/Release/dotnet-sdk-8.0.100-your-RID.tar.gz -C $HOME/dotnet + tar zxf artifacts/[your-arch]/Release/dotnet-sdk-8.0.100-[your-RID].tar.gz -C $HOME/dotnet ln -s $HOME/dotnet/dotnet /usr/bin/dotnet ``` @@ -120,6 +121,20 @@ The dependencies for building .NET from source can be found [here](https://githu dotnet --info ``` +### Building using Docker + +You can also build the repository using a Docker image which has the required prerequisites inside. +The example below creates a Docker volume named `vmr` and clones and builds the VMR there. + +```sh +docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 +git clone https://github.com/dotnet/dotnet . +./prep.sh && ./build.sh --online +mkdir -p $HOME/.dotnet +tar -zxf artifacts/x64/Release/dotnet-sdk-8.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet +ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet +``` + ## List of components To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: From 32fd2c87de47af6efd7e7b84c81f839864594d74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 16:09:18 +0000 Subject: [PATCH 152/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22580.16 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac31a1fe..38e17eb9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - dc776c147ea77a7ec036e1dcfe3004612beba964 + d32303957b75eeecc0a312e3eb5d18d0fd766090 - + https://github.com/dotnet/sdk - dc776c147ea77a7ec036e1dcfe3004612beba964 + d32303957b75eeecc0a312e3eb5d18d0fd766090 - + https://github.com/dotnet/sdk - dc776c147ea77a7ec036e1dcfe3004612beba964 + d32303957b75eeecc0a312e3eb5d18d0fd766090 - + https://github.com/dotnet/sdk - dc776c147ea77a7ec036e1dcfe3004612beba964 + d32303957b75eeecc0a312e3eb5d18d0fd766090 @@ -153,9 +153,9 @@ ea0b6351c129c7decd9bf76f4388239509e28e0d - + https://github.com/dotnet/msbuild - ee6f71d15eea77c970815d9105ab9520876c5042 + a2490dd3f78cce4abc8f9e6f1b5268437332818f diff --git a/eng/Versions.props b/eng/Versions.props index 8a0438559..5ae547b4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22602.1 - 8.0.100-alpha.1.22602.1 - 8.0.100-alpha.1.22602.1 + 8.0.100-alpha.1.22602.2 + 8.0.100-alpha.1.22602.2 + 8.0.100-alpha.1.22602.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b17dddca0dceb9e25f63920c4e1b13d2df4cca8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 16:55:07 +0000 Subject: [PATCH 153/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22601.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38e17eb9f..a6da32f94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 39b6e5e5eb552af4e9c509a4b55362776771c89d + 320f1e152974b93af36f71ddd7f0599521111206 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d32303957b75eeecc0a312e3eb5d18d0fd766090 + 50d082c0f9f63380103685ce33d0a74496cedc9b - + https://github.com/dotnet/sdk - d32303957b75eeecc0a312e3eb5d18d0fd766090 + 50d082c0f9f63380103685ce33d0a74496cedc9b - + https://github.com/dotnet/sdk - d32303957b75eeecc0a312e3eb5d18d0fd766090 + 50d082c0f9f63380103685ce33d0a74496cedc9b - + https://github.com/dotnet/sdk - d32303957b75eeecc0a312e3eb5d18d0fd766090 + 50d082c0f9f63380103685ce33d0a74496cedc9b @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + db068a6ef044a4b28ddddc9490494770287380c0 - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + db068a6ef044a4b28ddddc9490494770287380c0 diff --git a/eng/Versions.props b/eng/Versions.props index 5ae547b4e..5e4cbcd8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22602.2 - 8.0.100-alpha.1.22602.2 - 8.0.100-alpha.1.22602.2 + 8.0.100-alpha.1.22602.3 + 8.0.100-alpha.1.22602.3 + 8.0.100-alpha.1.22602.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22580.16 - 8.0.0-alpha.1.22580.16 + 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22601.3 2.1.0 From d3a5b68c0933a964cd80450410acefa420465e51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 10:26:19 -0800 Subject: [PATCH 154/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221201.1 (#15082) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22580.1 -> To Version 8.0.0-alpha.1.22601.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5456a2f4e..25dab6261 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - fd96997313778d5e9750d55cbb580e05bcc38465 + 82852951f9148c22e2aaeb0b1a7c3928401489db From 7b671f0bf0abd58c67a1cd30993a6618040808eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 19:26:58 +0000 Subject: [PATCH 155/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.7 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22601.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6da32f94..8bb7dbf07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 50d082c0f9f63380103685ce33d0a74496cedc9b + 3a12a4c2a731ea5963a8161ded6b62282d1323df - + https://github.com/dotnet/sdk - 50d082c0f9f63380103685ce33d0a74496cedc9b + 3a12a4c2a731ea5963a8161ded6b62282d1323df - + https://github.com/dotnet/sdk - 50d082c0f9f63380103685ce33d0a74496cedc9b + 3a12a4c2a731ea5963a8161ded6b62282d1323df - + https://github.com/dotnet/sdk - 50d082c0f9f63380103685ce33d0a74496cedc9b + 3a12a4c2a731ea5963a8161ded6b62282d1323df diff --git a/eng/Versions.props b/eng/Versions.props index 5e4cbcd8f..0d2c15052 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22602.3 - 8.0.100-alpha.1.22602.3 - 8.0.100-alpha.1.22602.3 + 8.0.100-alpha.1.22602.7 + 8.0.100-alpha.1.22602.7 + 8.0.100-alpha.1.22602.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da2c5d94d27fb73e565e058d82009b9db3d248eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 20:14:22 +0000 Subject: [PATCH 156/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22559.2 -> To Version 8.0.0-alpha.1.22601.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bb7dbf07..3f6c139c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 - + https://github.com/dotnet/aspnetcore - 600eb9aa53c052ec7327e2399744215dbe493a89 + 792e021af928d435276ffdb2149082ea3d8ce9c5 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3a12a4c2a731ea5963a8161ded6b62282d1323df + e1466aface70dcedb24106cee804a3ae0913e123 - + https://github.com/dotnet/sdk - 3a12a4c2a731ea5963a8161ded6b62282d1323df + e1466aface70dcedb24106cee804a3ae0913e123 - + https://github.com/dotnet/sdk - 3a12a4c2a731ea5963a8161ded6b62282d1323df + e1466aface70dcedb24106cee804a3ae0913e123 - + https://github.com/dotnet/sdk - 3a12a4c2a731ea5963a8161ded6b62282d1323df + e1466aface70dcedb24106cee804a3ae0913e123 diff --git a/eng/Versions.props b/eng/Versions.props index 0d2c15052..d372f7d26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 - 8.0.0-alpha.1.22601.15 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22602.1 0.2.0 - 8.0.100-alpha.1.22602.7 - 8.0.100-alpha.1.22602.7 - 8.0.100-alpha.1.22602.7 + 8.0.100-alpha.1.22602.8 + 8.0.100-alpha.1.22602.8 + 8.0.100-alpha.1.22602.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab3c3ca77087898d2e2e93aee6af9d4ea50717a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Dec 2022 21:06:12 +0000 Subject: [PATCH 157/249] Update dependencies from https://github.com/dotnet/sdk build 20221202.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22602.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22602.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f6c139c7..bf01b0141 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e1466aface70dcedb24106cee804a3ae0913e123 + 912454e3322a78045a147761bb77ecc05a598466 - + https://github.com/dotnet/sdk - e1466aface70dcedb24106cee804a3ae0913e123 + 912454e3322a78045a147761bb77ecc05a598466 - + https://github.com/dotnet/sdk - e1466aface70dcedb24106cee804a3ae0913e123 + 912454e3322a78045a147761bb77ecc05a598466 - + https://github.com/dotnet/sdk - e1466aface70dcedb24106cee804a3ae0913e123 + 912454e3322a78045a147761bb77ecc05a598466 - + https://github.com/dotnet/winforms - 8f1be5d8453763501aea20070bb6cabf97a49b34 + 358c1a3d4dabe150599b4136894e21fc4fccd59b - + https://github.com/dotnet/wpf - 959913ec4f81cc388928fad0c95840bf3ee4962b + 104e539716f681f0f54d35419bc9b1721b2bb02b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d372f7d26..63b2bfdf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22531.9 + 8.0.0-alpha.1.22580.5 - 8.0.0-alpha.1.22551.2 + 8.0.0-alpha.1.22601.6 @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22602.8 - 8.0.100-alpha.1.22602.8 - 8.0.100-alpha.1.22602.8 + 8.0.100-alpha.1.22602.9 + 8.0.100-alpha.1.22602.9 + 8.0.100-alpha.1.22602.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,10 +90,10 @@ - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 + 8.0.0-alpha.1.22602.2 + 8.0.0-alpha.1.22602.2 + 8.0.0-alpha.1.22602.2 + 8.0.0-alpha.1.22602.2 From 2b12a7984a1183b71061cc4d710576f897c01e26 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 2 Dec 2022 21:28:14 +0000 Subject: [PATCH 158/249] Update source-build toolset --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..a0fb661d1 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "8.0.100-alpha.1.22423.9" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From fd3cd65ae641408451c67912530446d0b0c283be Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 2 Dec 2022 22:41:15 +0000 Subject: [PATCH 159/249] Add aspnetcore nowarn --- src/SourceBuild/tarball/content/repos/aspnetcore.proj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index cea712c1b..8d4047ff8 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -25,8 +25,10 @@ - CS0618 + Requires https://github.com/dotnet/source-build/issues/2482 + CA1825 - Avoid unnecessary zero-length array allocations. + Requires aspnet to upgrade roslyn version. --> + CS0618;CA1825 From 6b60ba33bb6d918d185899e2f3520a815739919b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Sat, 3 Dec 2022 00:44:03 +0000 Subject: [PATCH 160/249] Update source-build dotnet toolset version --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index a0fb661d1..fce77b6a1 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.22423.9" + "dotnet": "8.0.100-alpha.1.22579.5" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b57d027ee0d72ae49b4762dc1cbdfe3d459c493f Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:12:11 +0200 Subject: [PATCH 161/249] use correct framework --- .../TableGenerator.Tests/TableGenerator.Tests.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj b/tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj index fc35c3646..2234374c1 100644 --- a/tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj +++ b/tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj @@ -1,6 +1,6 @@  - netcoreapp6.0 + net6.0 @@ -14,4 +14,4 @@ - \ No newline at end of file + From 233d6e664a6a67262e9c1c308f749fc310b2180c Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:13:03 +0200 Subject: [PATCH 162/249] use correct framework --- .../TableGenerator/TableGenerator.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj b/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj index d64c91c15..6564d2f11 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj +++ b/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp6.0 + net6.0 From 09218cde47545082df76465865332ca12ed033a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 08:55:39 +0000 Subject: [PATCH 163/249] Update dependencies from https://github.com/dotnet/sdk build 20221204.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22604.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22602.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd2834650..8fc601030 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 912454e3322a78045a147761bb77ecc05a598466 + fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf - + https://github.com/dotnet/sdk - 912454e3322a78045a147761bb77ecc05a598466 + fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf - + https://github.com/dotnet/sdk - 912454e3322a78045a147761bb77ecc05a598466 + fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf - + https://github.com/dotnet/sdk - 912454e3322a78045a147761bb77ecc05a598466 + fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf @@ -142,9 +142,9 @@ 110858a4ed4362ad8c254339ef6502d9802e1147 - + https://github.com/dotnet/linker - e816e7336f1737248d73d405c49f568fe1db745b + da244b780a1d1755cb7cb389df599fe650726892 linker diff --git a/eng/Versions.props b/eng/Versions.props index 63b2bfdf8..821267161 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22602.9 - 8.0.100-alpha.1.22602.9 - 8.0.100-alpha.1.22602.9 + 8.0.100-alpha.1.22604.1 + 8.0.100-alpha.1.22604.1 + 8.0.100-alpha.1.22604.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a35c3686ad46664ebe6ed9a74e367babac0a3a83 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 14:53:29 +0000 Subject: [PATCH 164/249] Update source-build projects to net8.0 tfm --- .../Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj | 2 +- .../Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index fc0d94c54..72dc0a037 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 true $(LeakDetectionTasksBinDir) diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj index 87982bdef..d458ea6f3 100755 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 $(XPlatTasksBinDir) From a4cf00cc5bc33c14ae282972374121e3d8bbb350 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 14:53:52 +0000 Subject: [PATCH 165/249] Disable aspnetcore apicompat for source-build --- ...ckage-validation-during-source-build.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch new file mode 100644 index 000000000..ae0f246dd --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 5 Dec 2022 14:38:29 +0000 +Subject: [PATCH] Disable package validation during source-build + +--- + eng/SourceBuild.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 63ebed2d9c..7a304205f2 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -55,6 +55,7 @@ + + + $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) ++ $(InnerBuildArgs) /p:EnablePackageValidation=false + $(InnerBuildArgs) /p:CrossgenOutput=false + + From 51a6dbc7089e1a431a1050de98b58436134aaa2d Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 16:54:13 +0000 Subject: [PATCH 166/249] Add runtime workaround --- src/SourceBuild/tarball/content/prep.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 27562569c..e348e1dcc 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -94,6 +94,9 @@ done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt if [ "$installDotnet" == "true" ]; then echo " Installing dotnet..." (source ./eng/common/tools.sh && InitializeDotNetCli true) + + # TODO: Remove once runtime dependency is gone + bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --version 7.0.0 --runtime dotnet fi # Build bootstrap, if specified From af141101398a38ad6e59916326590cfb30e3082d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 5 Dec 2022 18:27:45 +0100 Subject: [PATCH 167/249] Use relative paths when referencing YAML templates (#15086) --- .vsts-ci.yml | 60 ++++++++++++++++++++-------------------- eng/build.yml | 2 +- eng/pipelines/vmr-ci.yml | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1e0355974..bfa95549e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -71,7 +71,7 @@ stages: ## Windows - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT jobName: Build_Debug_x64 @@ -82,7 +82,7 @@ stages: ## Linux - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Ubuntu_22_04_Debug_x64 @@ -91,7 +91,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Fedora_36_Debug_x64 @@ -100,7 +100,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_CentOS_7_Debug_x64 @@ -109,7 +109,7 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Debian_Stretch_Debug_x64 @@ -119,7 +119,7 @@ stages: additionalBuildParameters: '/p:BuildSdkDeb=true' linuxPortable: false runTests: true - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Arm64_Debug @@ -129,7 +129,7 @@ stages: linuxPortable: true # Never run tests on arm64 runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 @@ -141,7 +141,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: true - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -152,7 +152,7 @@ stages: # MacOS - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Darwin jobName: Build_Release_x64 @@ -166,7 +166,7 @@ stages: ## Windows - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT jobName: Build_Release_x64 @@ -174,14 +174,14 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT jobName: Build_Release_x86 buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT jobName: Build_Release_arm64 @@ -191,7 +191,7 @@ stages: ## Linux - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Arm_Release @@ -200,7 +200,7 @@ stages: runtimeIdentifier: 'linux-arm' linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Arm64_Release @@ -209,7 +209,7 @@ stages: runtimeIdentifier: 'linux-arm64' linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm @@ -220,7 +220,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm64 @@ -230,7 +230,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 @@ -242,7 +242,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Deb_Release_x64 @@ -254,7 +254,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_x64 @@ -266,7 +266,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false' linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_Arm64 @@ -279,7 +279,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -290,14 +290,14 @@ stages: # MacOS - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Darwin jobName: Build_Release_x64 buildConfiguration: Release buildArchitecture: x64 runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Darwin jobName: Build_Release_arm64 @@ -308,7 +308,7 @@ stages: ## Windows PGO Instrumentation builds - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -317,7 +317,7 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -325,7 +325,7 @@ stages: buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -336,7 +336,7 @@ stages: ## Linux PGO Instrumentation builds - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux pgoInstrument: true @@ -346,7 +346,7 @@ stages: linuxPortable: true runTests: false - - template: /eng/build.yml + - template: eng/build.yml parameters: agentOs: Linux pgoInstrument: true @@ -363,7 +363,7 @@ stages: displayName: Synchronize VMR dependsOn: [] jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml + - template: eng/pipelines/templates/jobs/vmr-synchronization.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} @@ -372,7 +372,7 @@ stages: # synchronized into the VMR without problems. # You can do this by allowing the Synchronize_VMR stage from above in PRs. - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: /eng/pipelines/templates/stages/vmr-build.yml + - template: eng/pipelines/templates/stages/vmr-build.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} installerBuildResourceId: current diff --git a/eng/build.yml b/eng/build.yml index a76933ee1..246bf679e 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -64,7 +64,7 @@ parameters: default: false jobs: -- template: /eng/common/templates/job/job.yml +- template: common/templates/job/job.yml parameters: # Set up the name of the job. ${{ if parameters.pgoInstrument }}: diff --git a/eng/pipelines/vmr-ci.yml b/eng/pipelines/vmr-ci.yml index 3d76618ab..e4120bf9e 100644 --- a/eng/pipelines/vmr-ci.yml +++ b/eng/pipelines/vmr-ci.yml @@ -21,6 +21,6 @@ resources: endpoint: dotnet stages: -- template: /eng/pipelines/templates/stages/vmr-build.yml +- template: templates/stages/vmr-build.yml parameters: installerBuildResourceId: installer-build-resource From 930f52fefa95e9b0936cf21277e8abd70d8cc985 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 17:55:34 +0000 Subject: [PATCH 168/249] Update patch to workaround vmr sync issue --- .../0001-Disable-package-validation-during-source-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch index ae0f246dd..164b08ac6 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MichaelSimons -Date: Mon, 5 Dec 2022 14:38:29 +0000 +Date: Mon, 5 Dec 2022 17:35:56 +0000 Subject: [PATCH] Disable package validation during source-build --- From ca4fc022a8dec4d9d665161928814520872c9a34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 18:18:03 +0000 Subject: [PATCH 169/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22602.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc601030..24ae94d56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf + e68626e8cc6807a9188b4a77283d08ff8fd1ea29 - + https://github.com/dotnet/sdk - fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf + e68626e8cc6807a9188b4a77283d08ff8fd1ea29 - + https://github.com/dotnet/sdk - fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf + e68626e8cc6807a9188b4a77283d08ff8fd1ea29 - + https://github.com/dotnet/sdk - fbb24f9b8dd4f19d2c01f4a6d141ad656f640fbf + e68626e8cc6807a9188b4a77283d08ff8fd1ea29 diff --git a/eng/Versions.props b/eng/Versions.props index 821267161..c464bd46e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22604.1 - 8.0.100-alpha.1.22604.1 - 8.0.100-alpha.1.22604.1 + 8.0.100-alpha.1.22605.2 + 8.0.100-alpha.1.22605.2 + 8.0.100-alpha.1.22605.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7668aa1588ae0d24abd41aacfd054a518ff6b985 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 20:12:05 +0000 Subject: [PATCH 170/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22602.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ae94d56..0cc578e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e68626e8cc6807a9188b4a77283d08ff8fd1ea29 + 21f215981d82e9d500dc038e96e4acdf9ccbd830 - + https://github.com/dotnet/sdk - e68626e8cc6807a9188b4a77283d08ff8fd1ea29 + 21f215981d82e9d500dc038e96e4acdf9ccbd830 - + https://github.com/dotnet/sdk - e68626e8cc6807a9188b4a77283d08ff8fd1ea29 + 21f215981d82e9d500dc038e96e4acdf9ccbd830 - + https://github.com/dotnet/sdk - e68626e8cc6807a9188b4a77283d08ff8fd1ea29 + 21f215981d82e9d500dc038e96e4acdf9ccbd830 diff --git a/eng/Versions.props b/eng/Versions.props index c464bd46e..3d545764a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.2 - 8.0.100-alpha.1.22605.2 - 8.0.100-alpha.1.22605.2 + 8.0.100-alpha.1.22605.3 + 8.0.100-alpha.1.22605.3 + 8.0.100-alpha.1.22605.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10d243ed680f330edf6c98efb3dd4f3875ebd0b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 21:04:03 +0000 Subject: [PATCH 171/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cc578e78..96c712146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 8461d6590a4b96d636037868bd5ac7ee2904dd33 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 8461d6590a4b96d636037868bd5ac7ee2904dd33 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 8461d6590a4b96d636037868bd5ac7ee2904dd33 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 8461d6590a4b96d636037868bd5ac7ee2904dd33 + f1cdc563ac5d4a87d886149a5527fdbe295782ad https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 21f215981d82e9d500dc038e96e4acdf9ccbd830 + c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 - + https://github.com/dotnet/sdk - 21f215981d82e9d500dc038e96e4acdf9ccbd830 + c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 - + https://github.com/dotnet/sdk - 21f215981d82e9d500dc038e96e4acdf9ccbd830 + c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 - + https://github.com/dotnet/sdk - 21f215981d82e9d500dc038e96e4acdf9ccbd830 + c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 - + https://github.com/dotnet/winforms - 358c1a3d4dabe150599b4136894e21fc4fccd59b + 4f4829de9a3b4c56496a60ec18d774ca40956b53 - + https://github.com/dotnet/wpf - 104e539716f681f0f54d35419bc9b1721b2bb02b + ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 https://github.com/dotnet/fsharp @@ -142,9 +142,9 @@ 110858a4ed4362ad8c254339ef6502d9802e1147 - + https://github.com/dotnet/linker - da244b780a1d1755cb7cb389df599fe650726892 + 4d2e2c960526d2c7b769c02890e6faeab9c47037 linker diff --git a/eng/Versions.props b/eng/Versions.props index 3d545764a..3eb05a74b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22580.5 + 8.0.0-alpha.1.22602.3 - 8.0.0-alpha.1.22601.6 + 8.0.0-alpha.1.22603.1 @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.3 - 8.0.100-alpha.1.22605.3 - 8.0.100-alpha.1.22605.3 + 8.0.100-alpha.1.22605.4 + 8.0.100-alpha.1.22605.4 + 8.0.100-alpha.1.22605.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,10 +90,10 @@ - 8.0.0-alpha.1.22602.2 - 8.0.0-alpha.1.22602.2 - 8.0.0-alpha.1.22602.2 - 8.0.0-alpha.1.22602.2 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 From d822ce43b7f3bcab15576d5ed216e30c2a9e19c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 21:56:28 +0000 Subject: [PATCH 172/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96c712146..90986c7cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 - + https://github.com/dotnet/aspnetcore - 792e021af928d435276ffdb2149082ea3d8ce9c5 + c04f62cb3c13ec29263e42f37f971498b8346379 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 + bd13e3eee725e53128508929a9db07f64d8abd77 - + https://github.com/dotnet/sdk - c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 + bd13e3eee725e53128508929a9db07f64d8abd77 - + https://github.com/dotnet/sdk - c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 + bd13e3eee725e53128508929a9db07f64d8abd77 - + https://github.com/dotnet/sdk - c7c2e13c9e22dec4e2e8053ecffae29a250bceb7 + bd13e3eee725e53128508929a9db07f64d8abd77 diff --git a/eng/Versions.props b/eng/Versions.props index 3eb05a74b..3b30db938 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 - 8.0.0-alpha.1.22602.1 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.8 0.2.0 - 8.0.100-alpha.1.22605.4 - 8.0.100-alpha.1.22605.4 - 8.0.100-alpha.1.22605.4 + 8.0.100-alpha.1.22605.5 + 8.0.100-alpha.1.22605.5 + 8.0.100-alpha.1.22605.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cbc7313b667ddb9656f054364b19133dc8e90f7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:30:46 -0800 Subject: [PATCH 173/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221205.1 (#15089) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22580.1 -> To Version 8.0.0-alpha.1.22605.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25dab6261..2f92d4d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 4ed7440e89d5fe7d4375102a441c713fadd5357c + 2de3b50cf3c7bf33780c99ad76216d929d37ced4 From 35ba35f95dfd43d34f244765befcd480396f06fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 23:04:24 +0000 Subject: [PATCH 174/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90986c7cb..66ba1c430 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 320f1e152974b93af36f71ddd7f0599521111206 + 1a37caf773a3b857ccff49a31be3333d4fdc491f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bd13e3eee725e53128508929a9db07f64d8abd77 + b4e712678767fd30c3162f6190f5311f25726e8c - + https://github.com/dotnet/sdk - bd13e3eee725e53128508929a9db07f64d8abd77 + b4e712678767fd30c3162f6190f5311f25726e8c - + https://github.com/dotnet/sdk - bd13e3eee725e53128508929a9db07f64d8abd77 + b4e712678767fd30c3162f6190f5311f25726e8c - + https://github.com/dotnet/sdk - bd13e3eee725e53128508929a9db07f64d8abd77 + b4e712678767fd30c3162f6190f5311f25726e8c diff --git a/eng/Versions.props b/eng/Versions.props index 3b30db938..7b177aebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,25 +67,25 @@ - 8.0.100-alpha.1.22605.5 - 8.0.100-alpha.1.22605.5 - 8.0.100-alpha.1.22605.5 + 8.0.100-alpha.1.22605.6 + 8.0.100-alpha.1.22605.6 + 8.0.100-alpha.1.22605.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22601.3 - 8.0.0-alpha.1.22601.3 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 2.1.0 From 7531b36e3f8e7ca89d386bbc1fcb9ad8cdb529c4 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 23:29:19 +0000 Subject: [PATCH 175/249] Update patch to workaround vmr sync issue --- .../0001-Disable-package-validation-during-source-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch index 164b08ac6..1be5a581c 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -16,6 +16,6 @@ index 63ebed2d9c..7a304205f2 100644 $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) + $(InnerBuildArgs) /p:EnablePackageValidation=false - $(InnerBuildArgs) /p:CrossgenOutput=false + From 1ccc8b97f4395b843c6d6e3605c3f0e40e3cb39e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 5 Dec 2022 23:37:54 +0000 Subject: [PATCH 176/249] Update patch to workaround vmr sync issue --- .../0001-Disable-package-validation-during-source-build.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch index 1be5a581c..15f3815f0 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MichaelSimons -Date: Mon, 5 Dec 2022 17:35:56 +0000 +Date: Mon, 5 Dec 2022 23:35:39 +0000 Subject: [PATCH] Disable package validation during source-build --- @@ -8,7 +8,7 @@ Subject: [PATCH] Disable package validation during source-build 1 file changed, 1 insertion(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 63ebed2d9c..7a304205f2 100644 +index a034f88679..f3923138f8 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -55,6 +55,7 @@ From dc0b1e6d4d76d854b309a9272a456358c539b71d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 00:03:57 +0000 Subject: [PATCH 177/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7fff9f13..9e17bc7ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b4e712678767fd30c3162f6190f5311f25726e8c + accb9dafb3b14ba2f948bcae440e8b7e78c29c1c - + https://github.com/dotnet/sdk - b4e712678767fd30c3162f6190f5311f25726e8c + accb9dafb3b14ba2f948bcae440e8b7e78c29c1c - + https://github.com/dotnet/sdk - b4e712678767fd30c3162f6190f5311f25726e8c + accb9dafb3b14ba2f948bcae440e8b7e78c29c1c - + https://github.com/dotnet/sdk - b4e712678767fd30c3162f6190f5311f25726e8c + accb9dafb3b14ba2f948bcae440e8b7e78c29c1c @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 - + https://github.com/dotnet/fsharp - db068a6ef044a4b28ddddc9490494770287380c0 + ebf9aaa550b016202dcc4da55e89dfe7bc97346c - + https://github.com/dotnet/fsharp - db068a6ef044a4b28ddddc9490494770287380c0 + ebf9aaa550b016202dcc4da55e89dfe7bc97346c diff --git a/eng/Versions.props b/eng/Versions.props index 7b177aebd..324b74941 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.6 - 8.0.100-alpha.1.22605.6 - 8.0.100-alpha.1.22605.6 + 8.0.100-alpha.1.22605.8 + 8.0.100-alpha.1.22605.8 + 8.0.100-alpha.1.22605.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed862dea9040c9011bb741f1bc4e16aaa0895932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 00:52:29 +0000 Subject: [PATCH 178/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e17bc7ad..a0322d151 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - accb9dafb3b14ba2f948bcae440e8b7e78c29c1c + edf5866e300b44df074e3116dbe705e3ae6b5798 - + https://github.com/dotnet/sdk - accb9dafb3b14ba2f948bcae440e8b7e78c29c1c + edf5866e300b44df074e3116dbe705e3ae6b5798 - + https://github.com/dotnet/sdk - accb9dafb3b14ba2f948bcae440e8b7e78c29c1c + edf5866e300b44df074e3116dbe705e3ae6b5798 - + https://github.com/dotnet/sdk - accb9dafb3b14ba2f948bcae440e8b7e78c29c1c + edf5866e300b44df074e3116dbe705e3ae6b5798 diff --git a/eng/Versions.props b/eng/Versions.props index 324b74941..f1b701bd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.8 - 8.0.100-alpha.1.22605.8 - 8.0.100-alpha.1.22605.8 + 8.0.100-alpha.1.22605.9 + 8.0.100-alpha.1.22605.9 + 8.0.100-alpha.1.22605.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ef80b8dd53bd825b38193a1a27a9dfcbc225063 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 02:19:57 +0000 Subject: [PATCH 179/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0322d151..0dca3d4a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - edf5866e300b44df074e3116dbe705e3ae6b5798 + 4f6428ceab3931f6af0863e8a3503b6df8c0886f - + https://github.com/dotnet/sdk - edf5866e300b44df074e3116dbe705e3ae6b5798 + 4f6428ceab3931f6af0863e8a3503b6df8c0886f - + https://github.com/dotnet/sdk - edf5866e300b44df074e3116dbe705e3ae6b5798 + 4f6428ceab3931f6af0863e8a3503b6df8c0886f - + https://github.com/dotnet/sdk - edf5866e300b44df074e3116dbe705e3ae6b5798 + 4f6428ceab3931f6af0863e8a3503b6df8c0886f @@ -142,9 +142,9 @@ 110858a4ed4362ad8c254339ef6502d9802e1147 - + https://github.com/dotnet/linker - 4d2e2c960526d2c7b769c02890e6faeab9c47037 + f3469ca5e80e3701d90f8a376371eda940ba9687 linker diff --git a/eng/Versions.props b/eng/Versions.props index f1b701bd6..15f5fd31a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.9 - 8.0.100-alpha.1.22605.9 - 8.0.100-alpha.1.22605.9 + 8.0.100-alpha.1.22605.10 + 8.0.100-alpha.1.22605.10 + 8.0.100-alpha.1.22605.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c43fc8b69018a5697c106530342f0b2806d972df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 07:48:28 +0000 Subject: [PATCH 180/249] Update dependencies from https://github.com/dotnet/sdk build 20221205.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22605.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dca3d4a0..821dbaca1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 - + https://github.com/dotnet/aspnetcore - c04f62cb3c13ec29263e42f37f971498b8346379 + 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4f6428ceab3931f6af0863e8a3503b6df8c0886f + 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae - + https://github.com/dotnet/sdk - 4f6428ceab3931f6af0863e8a3503b6df8c0886f + 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae - + https://github.com/dotnet/sdk - 4f6428ceab3931f6af0863e8a3503b6df8c0886f + 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae - + https://github.com/dotnet/sdk - 4f6428ceab3931f6af0863e8a3503b6df8c0886f + 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae diff --git a/eng/Versions.props b/eng/Versions.props index 15f5fd31a..a31a95235 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 - 8.0.0-alpha.1.22605.8 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.15 0.2.0 - 8.0.100-alpha.1.22605.10 - 8.0.100-alpha.1.22605.10 - 8.0.100-alpha.1.22605.10 + 8.0.100-alpha.1.22605.12 + 8.0.100-alpha.1.22605.12 + 8.0.100-alpha.1.22605.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e0401f119dc2841e6eaaaaac131b0d3d65b8a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 10:46:39 +0000 Subject: [PATCH 181/249] Update dependencies from https://github.com/dotnet/sdk build 20221206.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22606.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 821dbaca1..ab0e1af8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae + f7528b181ab8a3a5cb3d4da23443617a30812baa - + https://github.com/dotnet/sdk - 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae + f7528b181ab8a3a5cb3d4da23443617a30812baa - + https://github.com/dotnet/sdk - 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae + f7528b181ab8a3a5cb3d4da23443617a30812baa - + https://github.com/dotnet/sdk - 92c307f05a036ddc3e8b8f0e7da40031f5dfbbae + f7528b181ab8a3a5cb3d4da23443617a30812baa @@ -137,9 +137,9 @@ ebf9aaa550b016202dcc4da55e89dfe7bc97346c - + https://github.com/microsoft/vstest - 110858a4ed4362ad8c254339ef6502d9802e1147 + 0a642588cebfe7f17b779acf1b37fac0bfd5f4fd diff --git a/eng/Versions.props b/eng/Versions.props index a31a95235..a8d174d44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22605.12 - 8.0.100-alpha.1.22605.12 - 8.0.100-alpha.1.22605.12 + 8.0.100-alpha.1.22606.2 + 8.0.100-alpha.1.22606.2 + 8.0.100-alpha.1.22606.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221201-01 + 17.5.0-preview-20221205-01 8.0.0-alpha.1.22557.12 From b8226e681bbf7115bee464c9b6325416d63f8518 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 11:42:58 +0000 Subject: [PATCH 182/249] Update dependencies from https://github.com/dotnet/sdk build 20221206.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22606.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab0e1af8e..1d15b8466 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 82daf67c4754ae5b1beac13d14c1b2e49b1351e8 + 955e293332027bf86f51cd4ee176edfb68c89b3f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f7528b181ab8a3a5cb3d4da23443617a30812baa + bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d - + https://github.com/dotnet/sdk - f7528b181ab8a3a5cb3d4da23443617a30812baa + bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d - + https://github.com/dotnet/sdk - f7528b181ab8a3a5cb3d4da23443617a30812baa + bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d - + https://github.com/dotnet/sdk - f7528b181ab8a3a5cb3d4da23443617a30812baa + bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d diff --git a/eng/Versions.props b/eng/Versions.props index a8d174d44..fdde0e627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 - 8.0.0-alpha.1.22605.15 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 0.2.0 - 8.0.100-alpha.1.22606.2 - 8.0.100-alpha.1.22606.2 - 8.0.100-alpha.1.22606.2 + 8.0.100-alpha.1.22606.3 + 8.0.100-alpha.1.22606.3 + 8.0.100-alpha.1.22606.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b180c090f2f17bd514e52bb876c0bf32805ea459 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 6 Dec 2022 12:53:38 +0100 Subject: [PATCH 183/249] Fix the patch --- ...1-Disable-package-validation-during-source-build.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch index 15f3815f0..148bdb954 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -8,14 +8,16 @@ Subject: [PATCH] Disable package validation during source-build 1 file changed, 1 insertion(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index a034f88679..f3923138f8 100644 +index 63ebed2d9c..a1f0263955 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props -@@ -55,6 +55,7 @@ - +@@ -56,6 +56,7 @@ $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) + $(InnerBuildArgs) /p:CrossgenOutput=false + $(InnerBuildArgs) /p:EnablePackageValidation=false +-- +2.30.2.windows.1 \ No newline at end of file From 976a60a79314e6941908c00f25b492802f32752f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 13:41:54 +0000 Subject: [PATCH 184/249] Update dependencies from https://github.com/dotnet/emsdk build 20221205.2 Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 8.0.0-alpha.1.22578.1 -> To Version 8.0.0-alpha.1.22605.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f92d4d88..8bf3275af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2039a62eeb52e1288f0b4aa6f71baae8f99a6f5b + 16e4d145b2c911c42c2668782dfc42e4500a425d - + https://github.com/dotnet/emsdk - 2039a62eeb52e1288f0b4aa6f71baae8f99a6f5b + 16e4d145b2c911c42c2668782dfc42e4500a425d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 2eca29ea8..adbe058fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,8 +221,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22578.1 - 8.0.0-alpha.1.22578.1 + 8.0.0-alpha.1.22605.2 + 8.0.0-alpha.1.22605.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From 6ab8cf174fdf3f70f21f5f1948c09ec6fa76db18 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 6 Dec 2022 19:32:16 +0100 Subject: [PATCH 185/249] Bump DarcLib --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 21dbdc87f..28fbb2185 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22601.1", + "version": "1.1.0-beta.22606.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d15b8466..7f23564dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade-services - 7706f3fc349838553a94c3b0d84060b50c47d514 + d5675a0eb7702168568d849a3c3453258710aaf5 - + https://github.com/dotnet/arcade-services - 7706f3fc349838553a94c3b0d84060b50c47d514 + d5675a0eb7702168568d849a3c3453258710aaf5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fdde0e627..71c7ef214 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22601.1 + 1.1.0-beta.22606.1 From a209ea3ea118ca1571ce4ce661062e5bc23e97b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 19:39:29 +0000 Subject: [PATCH 186/249] Update dependencies from https://github.com/dotnet/sdk build 20221206.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100-alpha.1.22606.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22604.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f23564dd..1968757d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - bf4da7e01882fe5b680eaa9d30d6f33fbdf1f23d + 21fafac880edeab5bba9026e10c1583641606391 @@ -137,9 +137,9 @@ ebf9aaa550b016202dcc4da55e89dfe7bc97346c - + https://github.com/microsoft/vstest - 0a642588cebfe7f17b779acf1b37fac0bfd5f4fd + 8b3abffcfe607f7c11bf27c79a1096451a2f85c3 diff --git a/eng/Versions.props b/eng/Versions.props index 71c7ef214..5318af985 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22606.3 - 8.0.100-alpha.1.22606.3 - 8.0.100-alpha.1.22606.3 + 8.0.100-alpha.1.22606.7 + 8.0.100-alpha.1.22606.7 + 8.0.100-alpha.1.22606.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221205-01 + 17.5.0-preview-20221205-07 8.0.0-alpha.1.22557.12 From b9cea4b4faf665a351f5994c1d4bbd5c103e281d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:00:45 +0000 Subject: [PATCH 187/249] Update dependencies from https://github.com/dotnet/arcade build 20221205.1 (#15090) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22576.1 to 1.0.0-beta.22580.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/tools.sh | 6 ------ global.json | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1968757d6..d3ca30d0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 + c96d78299a4fe5557bd564e44b63725cdbabd960 - + https://github.com/dotnet/arcade - 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 + c96d78299a4fe5557bd564e44b63725cdbabd960 - + https://github.com/dotnet/arcade - 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 + c96d78299a4fe5557bd564e44b63725cdbabd960 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - 9d44d854356c5ea0152b40acdef20c23bde58b03 + a54541e2b225c006bed2bc7c3c8e379069741466 diff --git a/eng/Versions.props b/eng/Versions.props index 5318af985..7a5b085be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22579.2 + 8.0.0-beta.22605.1 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e7d1e3897..975e6be63 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -416,12 +416,6 @@ function MSBuild { export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" - - # https://github.com/dotnet/arcade/issues/11369 - disable new MSBuild server feature on linux - # This feature is new and can result in build failures from connection timeout errors. - export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1 - Write-PipelineSetVariable -name "DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER" -value "1" - fi local toolset_dir="${_InitializeToolset%/*}" diff --git a/global.json b/global.json index e8fbb1a59..89017147f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22579.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22605.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22605.1" } } From 0e026558674bea9b4da9fa938cfe20ef15887d4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Dec 2022 23:22:50 +0000 Subject: [PATCH 188/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221206.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22605.1 -> To Version 8.0.0-alpha.1.22606.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f870a4f4a..c5bd8aeee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 2de3b50cf3c7bf33780c99ad76216d929d37ced4 + 42f1122c5d6b3d069c97e47458b0bf1deca04905 From 99646c6d3d77feb4a25ee98b9ed5a31b87fcf75b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 16:02:24 -0800 Subject: [PATCH 189/249] Update dependencies from https://github.com/dotnet/sdk build 20221206.10 (#15092) Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-alpha.1.22606.7 -> To Version 8.0.100-alpha.1.22606.10 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f870a4f4a..71ca3d984 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 21fafac880edeab5bba9026e10c1583641606391 + 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 - + https://github.com/dotnet/sdk - 21fafac880edeab5bba9026e10c1583641606391 + 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 - + https://github.com/dotnet/sdk - 21fafac880edeab5bba9026e10c1583641606391 + 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 - + https://github.com/dotnet/sdk - 21fafac880edeab5bba9026e10c1583641606391 + 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 diff --git a/eng/Versions.props b/eng/Versions.props index 19ee90e5d..4cad5cd5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ - 8.0.100-alpha.1.22606.7 - 8.0.100-alpha.1.22606.7 - 8.0.100-alpha.1.22606.7 + 8.0.100-alpha.1.22606.10 + 8.0.100-alpha.1.22606.10 + 8.0.100-alpha.1.22606.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 58e2d4ce1751d053213e0cacc4243323a855d5bd Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Dec 2022 17:29:15 -0800 Subject: [PATCH 190/249] We're being flagged because a couple of the templates target online sources by default so deleting those test directories when complete. --- test/EndToEnd/ProjectBuildTests.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 0678fb440..e6c0728fa 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -246,6 +246,12 @@ namespace EndToEnd.Tests //check if the template created files Assert.True(directory.Exists); Assert.True(directory.EnumerateFileSystemInfos().Any()); + + // delete test directory for some tests so we aren't leaving behind non-compliant nuget files + if (templateName.Equals("nugetconfig")) + { + directory.Delete(true); + } } [WindowsOnlyTheory] @@ -329,7 +335,7 @@ namespace EndToEnd.Tests public void ItCanCreateTemplateWithDefaultFramework(string templateName) { string framework = DetectExpectedDefaultFramework(templateName); - TestTemplateCreateAndBuild(templateName, build: false, framework: framework); + TestTemplateCreateAndBuild(templateName, build: false, framework: framework, deleteTestDirectory: true); } /// @@ -415,7 +421,7 @@ namespace EndToEnd.Tests throw new Exception("Unsupported version of SDK"); } - private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") + private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "", bool deleteTestDirectory = false) { DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); string projectDirectory = directory.FullName; @@ -468,6 +474,12 @@ namespace EndToEnd.Tests .Execute(buildArgs) .Should().Pass(); } + + // delete test directory for some tests so we aren't leaving behind non-compliant package files + if (deleteTestDirectory) + { + directory.Delete(true); + } } } } From 5c8e2326025cb51881d8d7a0a1cfc1ac83c55309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 7 Dec 2022 11:41:56 +0100 Subject: [PATCH 191/249] Fix triggers for the VMR CI (#15096) --- eng/pipelines/vmr-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/pipelines/vmr-ci.yml b/eng/pipelines/vmr-ci.yml index e4120bf9e..a63858e14 100644 --- a/eng/pipelines/vmr-ci.yml +++ b/eng/pipelines/vmr-ci.yml @@ -8,11 +8,6 @@ resources: branches: include: - main - - release/* - - internal/release/* - stages: - - Build - - VMR_Synchronization repositories: - repository: vmr From 46aba2f37f6ff36188f7252d2a2fdd738392a396 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Dec 2022 13:28:34 +0000 Subject: [PATCH 192/249] Update dependencies from https://github.com/dotnet/arcade build 20221206.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22605.1 -> To Version 8.0.0-beta.22606.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22580.1 -> To Version 1.0.0-beta.22605.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd6d7e788..28293f55a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c96d78299a4fe5557bd564e44b63725cdbabd960 + 513428e6a7a61bc5f4efd82afee219e90df51bfe - + https://github.com/dotnet/arcade - c96d78299a4fe5557bd564e44b63725cdbabd960 + 513428e6a7a61bc5f4efd82afee219e90df51bfe - + https://github.com/dotnet/arcade - c96d78299a4fe5557bd564e44b63725cdbabd960 + 513428e6a7a61bc5f4efd82afee219e90df51bfe https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - a54541e2b225c006bed2bc7c3c8e379069741466 + 0d65aa8023efa85de4945c07e7dc8a0f7992260c diff --git a/eng/Versions.props b/eng/Versions.props index 4cad5cd5d..4eb014b54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22605.1 + 8.0.0-beta.22606.1 diff --git a/global.json b/global.json index 89017147f..558fda0ef 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22605.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22605.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22606.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22606.1" } } From 7a76dca1c21970ee06de81a42860d53e31b82f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Wed, 7 Dec 2022 14:53:20 +0100 Subject: [PATCH 193/249] Simplify and fix test-template versions and variables --- eng/Versions.props | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4cad5cd5d..aedcb7f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,11 @@ + + 1.0.2-beta4.22406.1 1.0.2-beta4.22406.1 + + 1.1.0-rc.22558.1 1.1.0-rc.22558.1 1.1.0-rc.22558.1 1.1.0-rc.22558.1 @@ -164,7 +168,6 @@ 1.7.2 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - $(MicrosoftDotNetTestProjectTemplates50PackageVersion) 3.1.31 3.2.1 @@ -172,14 +175,12 @@ 3.0.0 1.6.5 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) + $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 3.0.1 1.5.3 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) + $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 2.1.34 From 4c8d08a81bc4f1d0788145f7378df05a88474f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Dec 2022 13:53:33 +0000 Subject: [PATCH 194/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221206.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22601.1 -> To Version 8.0.0-alpha.1.22606.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd6d7e788..32d0a52a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 82852951f9148c22e2aaeb0b1a7c3928401489db + 0b78f2932d3a804833ff5ca212c685bb25d2ba4f From 3735a516402208720f5fd7d104b2b882d762d2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 7 Dec 2022 20:06:24 +0100 Subject: [PATCH 195/249] Add a script for reproing VMR synchronization failures locally (#15097) --- eng/vmr-sync.sh | 180 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 eng/vmr-sync.sh diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh new file mode 100644 index 000000000..f948ff503 --- /dev/null +++ b/eng/vmr-sync.sh @@ -0,0 +1,180 @@ +#!/bin/bash + +### This script helps to reproduce potential failures of the 'Synchronize dotnet/dotnet' +### build step from the **VMR Source-Build** job locally. +### The following scenario is assumed: +### - There is a PR in dotnet/installer +### - The PR is failing on the 'VMR Source-Build' job in the 'Synchronize dotnet/dotnet' step +### +### There are a few possible reasons but usually this happens because there is a mismatch between +### source patches that are applied on top of the files that are being synchronized from repositories +### into the 'dotnet/dotnet' repo and new changes in the repositories. +### This manifests as the following error: +### fail: Failed to synchronize repo installer +### Failed to apply the patch for src/aspnetcore +### Exit code: 1 +### Std err: +### error: patch failed: src/aspnetcore/eng/SourceBuild.props:55 +### error: src/aspnetcore/eng/SourceBuild.props: patch does not apply +### +### where 'src/aspnetcore/eng/SourceBuild.props' would be the file that is being patched and new +### changes to it are conflicting with the patch that is being applied. +### +### The whole process can be reproduced locally easily by running this script. +### The patches are located in a folder in the 'dotnet/installer' repository. +### At the moment of writing, the location is 'src/SourceBuild/tarball/patches' but to get +### the up-to-date location, please see the 'patchesPath' property in +### https://github.com/dotnet/dotnet/blob/main/src/source-mappings.json +### +### You will need to compare what is in the patch and what is in the file and fix the patch. +### +### The tooling that synchronizes the VMR will need to clone the various repositories. +### It clones them into a temporary folder and re-uses them on future runs so it is advised +### you dedicate a folder to this to speed up your re-runs. +### +### This script will synchronize the 'dotnet/dotnet' repo locally and let you inspect the changes. +### +### USAGE: +### ./vmr-sync.sh --tmp-dir "$HOME/repos/tmp" +### Options: +### -t, --tmp, --tmp-dir PATH +### Required. Path to the temporary folder where repositories will be cloned +### -v, --vmr, --vmr-dir PATH +### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder +### -b, --branch, --vmr-branch BRANCH_NAME +### Optional. Branch of the 'dotnet/dotnet' repo to synchronize to +### This should match the target branch of the PR, defaults to 'main' +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +function print_help () { + sed -n '/^### /,/^$/p' "$source" | cut -b 5- +} + +COLOR_RED=$(tput setaf 1 2>/dev/null || true) +COLOR_CYAN=$(tput setaf 6 2>/dev/null || true) +COLOR_CLEAR=$(tput sgr0 2>/dev/null || true) +COLOR_RESET=uniquesearchablestring +FAILURE_PREFIX='> ' + +function fail () { + echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2 +} + +function highlight () { + echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" +} + +installer_dir="$scriptroot/../" +tmp_dir='' +vmr_dir='' +vmr_branch='main' +verbosity=verbose +# hashed name coming from the VMR tooling +INSTALLER_TMP_DIR_NAME='03298978DFFFCD23' + +while [[ $# -gt 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -t|--tmp|--tmp-dir) + tmp_dir=$2 + shift + ;; + -v|--vmr|--vmr-dir) + vmr_dir=$2 + shift + ;; + -b|--branch|--vmr-branch) + vmr_branch=$2 + shift + ;; + -d|--debug) + verbosity=debug + ;; + -h|--help) + print_help + exit 0 + ;; + *) + fail "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +if [[ ! -d "$installer_dir" ]]; then + fail "Directory '$installer_dir' does not exist. Please specify the path to the dotnet/installer repo" + exit 1 +fi + +if [[ -z "$tmp_dir" ]]; then + fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +fi + +if [[ -z "$vmr_dir" ]]; then + vmr_dir="$tmp_dir/dotnet" +fi + +if [[ ! -d "$tmp_dir" ]]; then + mkdir -p "$tmp_dir" +fi + +if [[ ! -d "$vmr_dir" ]]; then + highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." + git clone https://github.com/dotnet/dotnet "$vmr_dir" +else + if ! git -C "$vmr_dir" diff --quiet; then + fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes" + exit 1 + fi + + highlight "Preparing $vmr_dir" + git -C "$vmr_dir" checkout "$vmr_branch" + git -C "$vmr_dir" pull +fi + +set -e + +# These lines makes sure the temp dir (which the tooling would clone) +# has the synchronized commit inside as well +highlight 'Preparing the temporary directory..' +rm -rf "${tmp_dir:?}/$INSTALLER_TMP_DIR_NAME" +git clone "$installer_dir" "${tmp_dir:?}/$INSTALLER_TMP_DIR_NAME" + +# Prepare darc +highlight 'Installing .NET, preparing the tooling..' +source "$scriptroot/common/tools.sh" +InitializeDotNetCli true +dotnet="$scriptroot/../.dotnet/dotnet" +"$dotnet" tool restore + +# Run the sync +target_sha=$(git -C "$installer_dir" rev-parse HEAD) +highlight "Starting the synchronization to $target_sha.." +set +e + +if "$dotnet" darc vmr update --vmr "$vmr_dir" --tmp "$tmp_dir" --$verbosity --recursive installer:$target_sha; then + highlight "Synchronization succeeded" +else + fail "Synchronization of dotnet/dotnet to $target_sha failed!" + fail "$vmr_dir is left in its last state (re-run of this script will reset it)." + fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)." + fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +fi From 2bfa3f1d7b46d0fcb20b4f1659c8c04ca2a96738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Dec 2022 20:23:55 +0000 Subject: [PATCH 196/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221207.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22606.1 -> To Version 8.0.0-alpha.1.22607.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd6d7e788..f33ad38ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 42f1122c5d6b3d069c97e47458b0bf1deca04905 + 37a8ae6969a3247a9080efaf34f577c4c2d04cfe From 8cbf2cfa93979f3f23700e044bb006fd767896ae Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 7 Dec 2022 14:40:35 -0800 Subject: [PATCH 197/249] Fix comment --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 847a27b2c..4f5b52429 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -48,7 +48,7 @@ installer_commit="%commit%" installer_version="%version%" runtime_commit="%commit%" runtime_version="%version%" aspnetcore_commit="%commit%" aspnetcore_version="%version%" - windowsdesktop_commit="%commit%' windowsdesktop_commit="%version%" + windowsdesktop_commit="%commit%" windowsdesktop_version="%version%" sdk_commit="%commit%" sdk_version="%version%" --> From 2ed9180e1a2d47e552abb4575ab0b003960e10e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:07:39 -0800 Subject: [PATCH 198/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221207.1 (#15103) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22606.1 -> To Version 8.0.0-alpha.1.22607.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f267f4d7..5b7467e03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 0b78f2932d3a804833ff5ca212c685bb25d2ba4f + 9845ef580869dc613b301343504f8831d20f84da diff --git a/eng/Versions.props b/eng/Versions.props index 0bed5b8c3..4c0fd2489 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,12 +175,12 @@ 3.0.0 1.6.5 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) + $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 3.0.1 1.5.3 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) + $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 2.1.34 From 3a73ec3a792978181ad2c7f07395d0d43958ce23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:07:49 -0800 Subject: [PATCH 199/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221208.1 (#15102) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22607.1 -> To Version 8.0.0-alpha.1.22608.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b7467e03..9892347ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 37a8ae6969a3247a9080efaf34f577c4c2d04cfe + 17ad400c7b867c675b05aa3143163503bcdf8695 From 28a28d974fbb2d923ad904a25034bcf3f9084137 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 8 Dec 2022 19:58:51 +0000 Subject: [PATCH 200/249] Add KnownILLinkPack to bundled versions --- .../targets/GenerateBundledVersions.targets | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 4f5b52429..8f812954d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -86,6 +86,7 @@ <_NET70RuntimePackVersion>7.0.$(VersionFeature70) <_NET70TargetingPackVersion>7.0.$(VersionFeature70) + <_NET70ILLinkPackVersion>7.0.100-1.22579.2 <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) <_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70) <_AspNet70RuntimePackVersion>7.0.$(VersionFeature70) @@ -408,6 +409,10 @@ Copyright (c) .NET Foundation. All rights reserved. ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')" /> + + + + + + + + + + + + Date: Fri, 9 Dec 2022 03:01:54 +0000 Subject: [PATCH 201/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221208.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22608.1 -> To Version 8.0.0-alpha.1.22608.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9892347ad..70e6af96e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 17ad400c7b867c675b05aa3143163503bcdf8695 + 7164de443758bf790fb201659a6f5d7ccc55c3f0 From 0ac5380b7da7e4d04ea5648bc123fcc3416aeddd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Dec 2022 16:44:37 +0000 Subject: [PATCH 202/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221209.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22608.3 -> To Version 8.0.0-alpha.1.22609.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70e6af96e..319980d97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 7164de443758bf790fb201659a6f5d7ccc55c3f0 + 847c458e64fdc51b6445eadce74a7998ce4bbbfb From f4226eb972e9c9a31d66e60e470d8eacefe4122f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 19:47:46 +0000 Subject: [PATCH 203/249] [main] Update dependencies from dotnet/sdk (#15095) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22604.1 to 8.0.0-alpha.1.22607.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22604.1 to 8.0.0-alpha.1.22607.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22604.1 to 8.0.0-alpha.1.22607.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22605.17 to 8.0.0-alpha.1.22608.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22604.1 to 8.0.0-alpha.1.22607.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22604.1 to 8.0.0-alpha.1.22607.2 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.5.0-beta.22602.3 to 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22602.3 to 7.0.1-beta.22608.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221205-07 to 17.5.0-preview-20221208-02 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22605.2 to 8.0.100-1.22608.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22580.13 to 4.5.0-2.22608.26 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22601-03 to 17.5.0-preview-22608-02 (parent: Microsoft.NET.Sdk) - Remove obsolete razor-compiler repo - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-60d0a460-d2ee-450e-8d3c-efdb471745b1 - Add roslyn-analyzers source-build patch --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 30 +++---- eng/vmr-sync.sh | 0 .../tarball/content/repos/known-good.proj | 3 +- .../repos/{razor-compiler.proj => razor.proj} | 0 .../tarball/content/repos/sdk.proj | 3 +- ...ilt-assets-during-source-build-for-r.patch | 16 +++- 7 files changed, 76 insertions(+), 60 deletions(-) mode change 100644 => 100755 eng/vmr-sync.sh rename src/SourceBuild/tarball/content/repos/{razor-compiler.proj => razor.proj} (100%) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70e6af96e..9af823844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - f1cdc563ac5d4a87d886149a5527fdbe295782ad + 953e10da1e672367e370ec1ba6fadd8f2e889b48 - + https://github.com/dotnet/windowsdesktop - f1cdc563ac5d4a87d886149a5527fdbe295782ad + 953e10da1e672367e370ec1ba6fadd8f2e889b48 - + https://github.com/dotnet/windowsdesktop - f1cdc563ac5d4a87d886149a5527fdbe295782ad + 953e10da1e672367e370ec1ba6fadd8f2e889b48 - + https://github.com/dotnet/windowsdesktop - f1cdc563ac5d4a87d886149a5527fdbe295782ad + 953e10da1e672367e370ec1ba6fadd8f2e889b48 https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 - + https://github.com/dotnet/aspnetcore - 955e293332027bf86f51cd4ee176edfb68c89b3f + f543e3552514c5c420eeddd55c505bbc131f10a6 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 + 272a8141319b752501dae4b4c6d30e76482fc585 - + https://github.com/dotnet/sdk - 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 + 272a8141319b752501dae4b4c6d30e76482fc585 - + https://github.com/dotnet/sdk - 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 + 272a8141319b752501dae4b4c6d30e76482fc585 - + https://github.com/dotnet/sdk - 3ed8009d2bb26a9cd52875d9c4f80d504427a1f3 + 272a8141319b752501dae4b4c6d30e76482fc585 @@ -128,34 +128,34 @@ https://github.com/dotnet/wpf ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 - + https://github.com/dotnet/fsharp - ebf9aaa550b016202dcc4da55e89dfe7bc97346c + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/dotnet/fsharp - ebf9aaa550b016202dcc4da55e89dfe7bc97346c + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - 8b3abffcfe607f7c11bf27c79a1096451a2f85c3 + 3e2a581bc2c2154d5a603a48aa2a460fd87774fb - + https://github.com/dotnet/linker - f3469ca5e80e3701d90f8a376371eda940ba9687 + 679459944042cda47526e839d8edce75f735d5f4 linker - + https://github.com/dotnet/roslyn - ea0b6351c129c7decd9bf76f4388239509e28e0d + 716366a3830293571eaaad9b1b2b3929b5216f42 - + https://github.com/dotnet/msbuild - a2490dd3f78cce4abc8f9e6f1b5268437332818f + c81f58b45b97d3d0e547f48719322d55f00b5aa4 diff --git a/eng/Versions.props b/eng/Versions.props index 4c0fd2489..316486606 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 - 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22608.6 0.2.0 - 8.0.100-alpha.1.22606.10 - 8.0.100-alpha.1.22606.10 - 8.0.100-alpha.1.22606.10 + 8.0.100-alpha.1.22609.6 + 8.0.100-alpha.1.22609.6 + 8.0.100-alpha.1.22609.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-alpha.1.22604.1 - 8.0.0-alpha.1.22604.1 - 8.0.0-alpha.1.22604.1 - 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22607.2 + 8.0.0-alpha.1.22607.2 + 8.0.0-alpha.1.22607.2 + 8.0.0-alpha.1.22607.2 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221205-07 + 17.5.0-preview-20221208-02 8.0.0-alpha.1.22557.12 diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 0adee7f53..e92b6403a 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -34,7 +34,8 @@ - + + diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/razor-compiler.proj rename to src/SourceBuild/tarball/content/repos/razor.proj diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index c18e00dd6..0abd6d144 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -39,7 +39,8 @@ - + + diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index eec487f1b..95f423319 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -31,7 +31,8 @@ Backport: https://github.com/dotnet/source-build/issues/3049 .../GenerateDocumentationAndConfigFiles.csproj | 1 - ...umentationAndConfigFilesForBrokenRuntime.csproj | 4 +--- src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj | 1 + - 14 files changed, 10 insertions(+), 29 deletions(-) + .../Runtime/UseExceptionThrowHelpersFixer.cs | 2 +- + 15 files changed, 11 insertions(+), 30 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a467fb579..acd5db8bc 100644 @@ -225,3 +226,16 @@ index fe90e93ca..01b64e055 100644 +diff --git a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs +index 82a3e986c..336bd2a52 100644 +--- a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs ++++ b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs +@@ -121,7 +121,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context) + other is not null ? new SyntaxNode[] { arg, other } : new SyntaxNode[] { arg })).WithTriviaFrom(node)); + } + +- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider ++ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider + { + public static readonly CustomFixAllProvider Instance = new(); + From 2824d95e89b062efeccbdda7d6fff34901d407b3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 9 Dec 2022 15:22:49 -0600 Subject: [PATCH 204/249] Addressing NuGet prebuilts (#15112) * Add patch for XDT prebuilt in nuget-client * Update nuget-client patch with more props * Add CS9057 nowarn to nuget-client for source-build Co-authored-by: Logan Bussell --- .../tarball/content/repos/nuget-client.proj | 1 + ...-version-properties-for-source-build.patch | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch diff --git a/src/SourceBuild/tarball/content/repos/nuget-client.proj b/src/SourceBuild/tarball/content/repos/nuget-client.proj index eccc1a738..586565cac 100644 --- a/src/SourceBuild/tarball/content/repos/nuget-client.proj +++ b/src/SourceBuild/tarball/content/repos/nuget-client.proj @@ -6,6 +6,7 @@ false true true + CS9057 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch new file mode 100644 index 000000000..76a1abde5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 21 Nov 2022 22:32:04 +0000 +Subject: [PATCH] Add package version properties for source-build + +Backport: https://github.com/NuGet/Home/issues/12261 +--- + Directory.Packages.props | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 8afa7dd31..0c4eaecf5 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -9,11 +9,13 @@ + 17.2.0-preview-2-32304-091 + 16.153.0 + +- 17.3.1 ++ 17.3.1 + + 16.8.0 + + 16.11.0 ++ 3.0.0 ++ 4.5.0 + + + +@@ -56,7 +58,7 @@ + + + +- ++ + + + +@@ -66,7 +68,7 @@ + + + +- ++ + + + From 144a5f4328ecdd978c9ef664c315a7d967a05858 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 9 Dec 2022 15:27:13 -0600 Subject: [PATCH 205/249] Remove source-build tarball creation infrastructure (#15114) * Remove source-build tarball creation infrastructure * Remove tarball logic to build text-only packages --- .devcontainer/devcontainer.json | 23 - .../source-build-scripts/buildTarball.sh | 12 - .../source-build-scripts/createTarball.sh | 7 - .../source-build-tarball/devcontainer.json | 20 - .devcontainer/source-build/devcontainer.json | 5 - eng/Build.props | 8 - src/SourceBuild/Arcade/README.md | 1 - .../Arcade/src/SourceBuild.Tasks.csproj | 17 - ...ourceBuildIntermediateNupkgDependencies.cs | 180 -------- .../src/Tarball_WriteSourceRepoProperties.cs | 194 -------- src/SourceBuild/Arcade/tools/BuildTasks.props | 7 - .../tools/SourceBuildArcadeTarball.targets | 415 ------------------ .../Arcade/tools/TextOnlyPackages.csproj | 45 -- .../tarball/BuildSourceBuildTarball.proj | 10 - .../tarball/content/Directory.Build.props | 1 - .../content/tools-local/init-build.proj | 27 -- 16 files changed, 972 deletions(-) delete mode 100644 .devcontainer/devcontainer.json delete mode 100755 .devcontainer/source-build-scripts/buildTarball.sh delete mode 100755 .devcontainer/source-build-scripts/createTarball.sh delete mode 100644 .devcontainer/source-build-tarball/devcontainer.json delete mode 100644 .devcontainer/source-build/devcontainer.json delete mode 100644 src/SourceBuild/Arcade/README.md delete mode 100644 src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj delete mode 100644 src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs delete mode 100644 src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs delete mode 100644 src/SourceBuild/Arcade/tools/BuildTasks.props delete mode 100644 src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets delete mode 100644 src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj delete mode 100644 src/SourceBuild/tarball/BuildSourceBuildTarball.proj diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 30953897c..000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,23 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet -{ - "name": "Source-Build w/ Built Tarball", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", - // A completely built .NET source-tarball is >64 GB - "hostRequirements": { - "storage": "128gb" - }, - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "ms-dotnettools.csharp", - "eamodio.gitlens" - ] - } - }, - // Use 'onCreateCommand' to run pre-build commands inside the codespace. - "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/source-build-scripts/buildTarball.sh" -} \ No newline at end of file diff --git a/.devcontainer/source-build-scripts/buildTarball.sh b/.devcontainer/source-build-scripts/buildTarball.sh deleted file mode 100755 index d1b714e77..000000000 --- a/.devcontainer/source-build-scripts/buildTarball.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -./.devcontainer/source-build-scripts/createTarball.sh - -cd $(realpath ..)/dotnet-source/ - -./prep.sh - -# GitHub Codespaces automatically sets RepositoryName, which conflicts with source-build scripts. -unset RepositoryName - -./build.sh --online --clean-while-building || true diff --git a/.devcontainer/source-build-scripts/createTarball.sh b/.devcontainer/source-build-scripts/createTarball.sh deleted file mode 100755 index c66753b16..000000000 --- a/.devcontainer/source-build-scripts/createTarball.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Always return exit code 0 so that we can use the codespaces prebuild to diagnose build errors. -./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=$(realpath ..)/dotnet-source/ /p:PreserveTarballGitFolders=true || true - -# Save the commit hash of the currently built repo, so developers know which version was built -git rev-parse HEAD > ./artifacts/prebuild.sha \ No newline at end of file diff --git a/.devcontainer/source-build-tarball/devcontainer.json b/.devcontainer/source-build-tarball/devcontainer.json deleted file mode 100644 index 4fa2238bf..000000000 --- a/.devcontainer/source-build-tarball/devcontainer.json +++ /dev/null @@ -1,20 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/dotnet -{ - "name": "Source-Build w/ Tarball", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", - // A completely built .NET source tarball is >64 GB - "hostRequirements": { - "storage": "128gb" - }, - "customizations": { - "vscode": { - "extensions": [ - "ms-dotnettools.csharp", - "eamodio.gitlens" - ] - } - }, - // Use 'onCreateCommand' to run pre-build commands inside the codespace. - "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/createTarball.sh" -} \ No newline at end of file diff --git a/.devcontainer/source-build/devcontainer.json b/.devcontainer/source-build/devcontainer.json deleted file mode 100644 index e38bc27f0..000000000 --- a/.devcontainer/source-build/devcontainer.json +++ /dev/null @@ -1,5 +0,0 @@ -// Use this devcontainer if you don't need the full context of a source-build tarball -{ - "name": "Source-Build", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36" -} \ No newline at end of file diff --git a/eng/Build.props b/eng/Build.props index ed33d0bbf..ff9b72504 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,13 +1,5 @@ - - - - - - - - diff --git a/src/SourceBuild/Arcade/README.md b/src/SourceBuild/Arcade/README.md deleted file mode 100644 index ad15a2f14..000000000 --- a/src/SourceBuild/Arcade/README.md +++ /dev/null @@ -1 +0,0 @@ -The source and targets in the `src/SourceBuild/Arcade` directory are intended to move into the Arcade repo at some point. They are added here for ease of development while developing the tarball generation process. See https://github.com/dotnet/source-build/issues/2295 diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj deleted file mode 100644 index 2842d265d..000000000 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - net7.0 - false - false - disable - - - - - - - - - - - diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs deleted file mode 100644 index 9b6365dfc..000000000 --- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs +++ /dev/null @@ -1,180 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; - -namespace Microsoft.DotNet.SourceBuild.Tasks -{ - /// - /// Reads entries in a Version.Details.xml file to find intermediate nupkg dependencies. For - /// each dependency with a "SourceBuild" element, adds an item to the "Dependencies" output. - /// - public class Tarball_ReadSourceBuildIntermediateNupkgDependencies : Task - { - [Required] - public string VersionDetailsXmlFile { get; set; } - - [Required] - public string SourceBuildIntermediateNupkgPrefix { get; set; } - - /// - /// Convert any internal repo references to the public GitHub repos. - /// - public bool ConvertInternalRepos { get; set; } - - /// - /// The intermediate nupkg RID to use if any RID-specific intermediate nupkgs are required. - /// If this parameter isn't specified, RID-specific intermediate nupkgs can't be used and - /// this task fails. - /// - public string SourceBuildIntermediateNupkgRid { get; set; } - - /// - /// %(Identity): NuGet package ID. - /// %(Name): The Name of the dependency from Version.Details.xml. - /// %(ExactVersion): NuGet package version. This can be used to look up the restored package - /// contents in a package cache. - /// %(Version): NuGet package version, wrapped in "[version]" syntax for exact match. - /// %(Uri): The URI for the repo. - /// %(Sha): The commit Sha for the dependency. - /// %(SourceBuildRepoName): The repo name to use in source-build. - /// - [Output] - public ITaskItem[] Dependencies { get; set; } - - public override bool Execute() - { - XElement root = XElement.Load(VersionDetailsXmlFile, LoadOptions.PreserveWhitespace); - - XName CreateQualifiedName(string plainName) - { - return root.GetDefaultNamespace().GetName(plainName); - } - - Dependencies = root - .Elements() - .Elements(CreateQualifiedName("Dependency")) - .Select(d => - { - XElement sourceBuildElement = d.Element(CreateQualifiedName("SourceBuild")); - - if (sourceBuildElement == null) - { - // Workaround for https://github.com/dotnet/source-build/issues/2481 - sourceBuildElement = d.Element(CreateQualifiedName("SourceBuildTarball")); - - if (sourceBuildElement == null) - { - // Ignore element: doesn't represent a source-build dependency. - return null; - } - } - - string repoName = sourceBuildElement.Attribute("RepoName")?.Value; - - if (string.IsNullOrEmpty(repoName)) - { - Log.LogError($"Dependency SourceBuild RepoName null or empty in '{VersionDetailsXmlFile}' element {d}"); - return null; - } - - string dependencyName = d.Attribute("Name")?.Value ?? string.Empty; - - if (string.IsNullOrEmpty(dependencyName)) - { - // Log name missing as FYI, but this is not an error case for source-build. - Log.LogMessage($"Dependency Name null or empty in '{VersionDetailsXmlFile}' element {d}"); - } - - string dependencyVersion = d.Attribute("Version")?.Value; - - string uri = d.Element(CreateQualifiedName("Uri"))?.Value; - if (ConvertInternalRepos) - { - uri = ConvertInternalRepo(uri); - } - - string sha = d.Element(CreateQualifiedName("Sha"))?.Value; - string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value; - - if (string.IsNullOrEmpty(dependencyVersion)) - { - // We need a version to bring down an intermediate nupkg. Fail. - Log.LogError($"Dependency Version null or empty in '{VersionDetailsXmlFile}' element {d}"); - return null; - } - - string identity = SourceBuildIntermediateNupkgPrefix + repoName; - - bool.TryParse( - sourceBuildElement.Attribute("ManagedOnly")?.Value, - out bool managedOnly); - - // If RID-specific, add the RID to the end of the identity. - if (!managedOnly) - { - if (string.IsNullOrEmpty(SourceBuildIntermediateNupkgRid)) - { - Log.LogError( - $"Parameter {nameof(SourceBuildIntermediateNupkgRid)} was " + - "not specified, indicating this project depends only on managed " + - "inputs. However, source-build element is not ManagedOnly: " + - sourceBuildElement); - return null; - } - - identity += "." + SourceBuildIntermediateNupkgRid; - } - - return new TaskItem( - identity, - new Dictionary - { - ["Name"] = dependencyName, - ["Version"] = $"[{dependencyVersion}]", - ["ExactVersion"] = dependencyVersion, - ["Uri"] = uri, - ["Sha"] = sha, - ["SourceBuildRepoName"] = sourceBuildRepoName - }); - }) - .Where(d => d != null) - .ToArray(); - - return !Log.HasLoggedErrors; - } - - private string ConvertInternalRepo(string uri) - { - if (uri.StartsWith("https://dev.azure.com", StringComparison.OrdinalIgnoreCase)) - { - string[] repoParts = uri.Substring(uri.LastIndexOf('/')).Split('-', 2); - - if (repoParts.Length != 2) - { - Log.LogError($"Repo '{uri}' does not end with the expected - format"); - return null; - } - - string org = repoParts[0]; - string repo = repoParts[1]; - - // The internal Nuget.Client repo has suffix which needs to be accounted for. - const string trustedSuffix = "-Trusted"; - if (uri.EndsWith(trustedSuffix, StringComparison.OrdinalIgnoreCase)) - { - repo = repo.Substring(0, repo.Length - trustedSuffix.Length); - } - - uri = $"https://github.com/{org}/{repo}"; - } - - return uri; - } - } -} diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs deleted file mode 100644 index b177b6f01..000000000 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ /dev/null @@ -1,194 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using NuGet.Versioning; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Xml.Serialization; - -namespace Microsoft.DotNet.SourceBuild.Tasks -{ - /// - /// Writes a props file to the given directory for each dependency specified - /// plus adds or updates an existing props file with all dependencies. The - /// intention is for the props file to be included by a source-build build - /// to get metadata about each dependent repo. - /// - public class Tarball_WriteSourceRepoProperties : Task - { - /// - /// The directory to write the props files to. - /// - [Required] - public string SourceBuildMetadataDir { get; set; } - - /// - /// Dependencies to include in the props files. - /// - /// %(Identity): NuGet package ID. - /// %(Name): The Name of the dependency from Version.Details.xml. - /// %(ExactVersion): NuGet package version. This can be used to look up the restored package - /// contents in a package cache. - /// %(Version): NuGet package version, wrapped in "[version]" syntax for exact match. - /// %(Uri): The URI for the repo. - /// %(Sha): The commit Sha for the dependency. - /// %(SourceBuildRepoName): The repo name to use in source-build. - /// - /// - [Required] - public ITaskItem[] Dependencies { get; set; } - - public override bool Execute() - { - var allRepoProps = new Dictionary(); - - foreach (var dependency in Dependencies.Select(dep => - new { - Name = dep.GetMetadata("Name"), - SourceBuildRepoName = dep.GetMetadata("SourceBuildRepoName"), - Version = dep.GetMetadata("ExactVersion"), - Sha = dep.GetMetadata("Sha"), - Uri = dep.GetMetadata("Uri"), - GitCommitCount = dep.GetMetadata("GitCommitCount") - })) - { - string repoName = dependency.SourceBuildRepoName; - string safeRepoName = repoName.Replace("-", "").Replace(".", ""); - string propsPath = Path.Combine(SourceBuildMetadataDir, $"{repoName.Replace(".", "-")}.props"); - DerivedVersion derivedVersion = GetVersionInfo(safeRepoName, dependency.Version, "0"); - var repoProps = new Dictionary - { - ["GitCommitHash"] = dependency.Sha, - ["OfficialBuildId"] = derivedVersion.OfficialBuildId, - ["OutputPackageVersion"] = dependency.Version, - ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", - }; - if (!string.IsNullOrEmpty(dependency.GitCommitCount)) - { - repoProps.Add("GitCommitCount", dependency.GitCommitCount); - } - WritePropsFile(propsPath, repoProps); - allRepoProps[$"{safeRepoName}GitCommitHash"] = dependency.Sha; - allRepoProps[$"{safeRepoName}OutputPackageVersion"] = dependency.Version; - } - string allRepoPropsPath = Path.Combine(SourceBuildMetadataDir, "AllRepoVersions.props"); - Log.LogMessage(MessageImportance.Normal, $"[{DateTimeOffset.Now}] Writing all repo versions to {allRepoPropsPath}"); - UpdatePropsFile(allRepoPropsPath, allRepoProps); - - return !Log.HasLoggedErrors; - } - - /// - /// Reverse a version in the Arcade style (https://github.com/dotnet/arcade/blob/fb92b14d8cd07cf44f8f7eefa8ac58d7ffd05f3f/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L18) - /// back to an OfficialBuildId + ReleaseLabel which we can then supply to get the same resulting version number. - /// - /// The source build name of the repo to get the version info for. - /// The complete version, e.g. 1.0.0-beta1-19720.5 - /// The current commit count of the repo. This is used for some repos that do not use the standard versioning scheme. - /// - private static DerivedVersion GetVersionInfo(string repoName, string version, string commitCount) - { - var nugetVersion = new NuGetVersion(version); - - if (!string.IsNullOrWhiteSpace(nugetVersion.Release)) - { - var releaseParts = nugetVersion.Release.Split('-', '.'); - if (repoName.Contains("nuget")) - { - // NuGet does this - arbitrary build IDs - return new DerivedVersion { OfficialBuildId = DateTime.Now.ToString("yyyyMMdd.1"), PreReleaseVersionLabel = releaseParts[0] }; - } - else if (releaseParts.Length == 3) - { - // VSTest uses full dates for the first part of their preview build numbers - if (repoName.Contains("vstest")) - { - return new DerivedVersion { OfficialBuildId = $"{releaseParts[1]}.{releaseParts[2]}", PreReleaseVersionLabel = releaseParts[0] }; - } - else if (int.TryParse(releaseParts[1], out int datePart) && int.TryParse(releaseParts[2], out int buildPart)) - { - if (datePart > 1 && datePart < 8 && buildPart > 1000 && buildPart < 10000) - { - return new DerivedVersion { OfficialBuildId = releaseParts[2], PreReleaseVersionLabel = $"{releaseParts[0]}.{releaseParts[1]}" }; - } - else - { - return new DerivedVersion { OfficialBuildId = $"20{((datePart / 1000))}{((datePart % 1000) / 50):D2}{(datePart % 50):D2}.{buildPart}", PreReleaseVersionLabel = releaseParts[0] }; - } - } - } - else if (releaseParts.Length == 4) - { - // new preview version style, e.g. 5.0.0-preview.7.20365.12 - if (int.TryParse(releaseParts[2], out int datePart) && int.TryParse(releaseParts[3], out int buildPart)) - { - return new DerivedVersion { OfficialBuildId = $"20{((datePart / 1000))}{((datePart % 1000) / 50):D2}{(datePart % 50):D2}.{buildPart}", PreReleaseVersionLabel = $"{releaseParts[0]}.{releaseParts[1]}" }; - } - } - } - else - { - // finalized version number (x.y.z) - probably not our code - // Application Insights, Newtonsoft.Json do this - return new DerivedVersion { OfficialBuildId = DateTime.Now.ToString("yyyyMMdd.1"), PreReleaseVersionLabel = string.Empty }; - } - - throw new FormatException($"Can't derive a build ID from version {version} (commit count {commitCount}, release {string.Join(";", nugetVersion.Release.Split('-', '.'))})"); - } - - private static void UpdatePropsFile(string filePath, Dictionary properties) - { - if (!File.Exists(filePath)) - { - WritePropsFile(filePath, properties); - } - else - { - var content = new StringBuilder(); - foreach (var line in File.ReadAllLines(filePath)) - { - content.AppendLine(line); - if (line.Contains("")) - { - foreach (var propName in properties.Keys.OrderBy(k => k)) - { - content.AppendLine($" <{propName}>{properties[propName]}"); - } - } - } - File.WriteAllText(filePath, content.ToString()); - } - } - - private static void WritePropsFile(string filePath, Dictionary properties) - { - var content = new StringBuilder(); - content.AppendLine(""); - content.AppendLine(""); - content.AppendLine(" "); - foreach (var propName in properties.Keys.OrderBy(k => k)) - { - content.AppendLine($" <{propName}>{properties[propName]}"); - } - content.AppendLine(" "); - content.AppendLine(""); - File.WriteAllText(filePath, content.ToString()); - } - - private class DerivedVersion - { - internal string OfficialBuildId { get; set; } - internal string PreReleaseVersionLabel { get; set; } - } - } -} diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props deleted file mode 100644 index 50f49046b..000000000 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net7.0\SourceBuild.Tasks.dll - - \ No newline at end of file diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets deleted file mode 100644 index 1f7c8aed3..000000000 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ /dev/null @@ -1,415 +0,0 @@ - - - - - - - - - - - - - - - - $(RepoRoot)artifacts/ - $(ArtifactsDir)tarball/ - $([MSBuild]::EnsureTrailingSlash('$(TarballDir)')) - $(TarballRootDir)src/ - $(TarballRootDir)git-info/ - quiet - true - - - - - - $([System.IO.Path]::GetDirectoryName('$(TarballFilePath)')) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(GitHubRepositoryName) - $(VersionPrefix) - $(VersionPrefix) - @(RootRepoCommitSha) - @(RootRepoUri) - @(RootRepoCommitCount) - $(GitHubRepositoryName) - true - - - - - - - %(SourceBuildRepos.SourceBuildRepoName) - %(SourceBuildRepos.Uri) - %(SourceBuildRepos.Sha) - %(SourceBuildRepos.IsRootRepo) - - - - - - - - - - - - - $(SourceBuildRepoName)/ - $(TarballSourceDir)$(SourceDir) - $(TarballSourceDir)$(SourceDir)eng/ - $(TarballRepoSourceEngDir)Version.Details.xml - -q - $(RepoUri) - $(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com')) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(ArtifactsDir)text-only-packages/ - $(TarballRootDir)packages/text-only/ - - - - - - - - - - - - - - - - - - - $(TarballRootDir)packages/archive/ - Private.SourceBuilt.Artifacts - Private.SourceBuilt.Prebuilts - https://dotnetcli.azureedge.net/source-built-artifacts/assets/ - archiveArtifacts.txt - $(ExternalTarballsDir)$(ArchiveArtifactsTextFileName) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $([System.IO.Path]::GetFileName('$(TextOnlyDirectory)')) - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj deleted file mode 100644 index 3de474133..000000000 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - net7.0 - $(TargetPackagesPath) - - - - - - - - - - - - - - - - - - - - - - - - - @(TextOnlyPackagesDirectories) - - - - - diff --git a/src/SourceBuild/tarball/BuildSourceBuildTarball.proj b/src/SourceBuild/tarball/BuildSourceBuildTarball.proj deleted file mode 100644 index 7b5becb77..000000000 --- a/src/SourceBuild/tarball/BuildSourceBuildTarball.proj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - $(ArtifactsShippingPackagesDir)dotnet-sdk-source-$(Version).tar.gz - - - - - diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 8880b5d05..5229c0ebb 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -142,7 +142,6 @@ $(BaseOutputPath)conflict-report/ $(PackageReportDir)PrebuiltBurndownData.csv $(ProjectDir)packages/archive/ - $(ProjectDir)packages/text-only/ $(ProjectDir)packages/reference/ Private.SourceBuilt.Artifacts Private.SourceBuilt.Prebuilts diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 0405ad8f1..9af3e2741 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -27,7 +27,6 @@ BuildLeakDetection; ExtractToolPackage; GenerateRootFs; - BuildTextOnlyPackages; PoisonPrebuiltPackages" /> @@ -154,32 +153,6 @@ - - - - - - - - - - - - - - - - - Date: Fri, 9 Dec 2022 22:45:08 +0000 Subject: [PATCH 206/249] Update dependencies from https://github.com/dotnet/sdk build 20221209.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-alpha.1.22609.6 -> To Version 8.0.100-alpha.1.22609.8 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221208-02 -> To Version 17.5.0-preview-20221209-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9af823844..0b621d48c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 272a8141319b752501dae4b4c6d30e76482fc585 + 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 - + https://github.com/dotnet/sdk - 272a8141319b752501dae4b4c6d30e76482fc585 + 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 - + https://github.com/dotnet/sdk - 272a8141319b752501dae4b4c6d30e76482fc585 + 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 - + https://github.com/dotnet/sdk - 272a8141319b752501dae4b4c6d30e76482fc585 + 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 @@ -137,9 +137,9 @@ ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - 3e2a581bc2c2154d5a603a48aa2a460fd87774fb + 8da5d535932a4143bbd8594c8a66cca686db9bfc diff --git a/eng/Versions.props b/eng/Versions.props index 316486606..907d9aa23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-alpha.1.22609.6 - 8.0.100-alpha.1.22609.6 - 8.0.100-alpha.1.22609.6 + 8.0.100-alpha.1.22609.8 + 8.0.100-alpha.1.22609.8 + 8.0.100-alpha.1.22609.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221208-02 + 17.5.0-preview-20221209-01 8.0.0-alpha.1.22557.12 From b91fdd29e43faea7ec502d4874712ee11a46fdfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Dec 2022 04:33:39 +0000 Subject: [PATCH 207/249] Update dependencies from https://github.com/dotnet/sdk build 20221209.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-alpha.1.22609.6 -> To Version 8.0.100-alpha.1.22609.9 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221208-02 -> To Version 17.5.0-preview-20221209-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b621d48c..8a34ac930 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 + e332d638f326b2ac0e3d374f4b4a8a016398d100 - + https://github.com/dotnet/sdk - 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 + e332d638f326b2ac0e3d374f4b4a8a016398d100 - + https://github.com/dotnet/sdk - 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 + e332d638f326b2ac0e3d374f4b4a8a016398d100 - + https://github.com/dotnet/sdk - 0ade9d4e7b5b828c38f2bfe3150f8c010276c916 + e332d638f326b2ac0e3d374f4b4a8a016398d100 diff --git a/eng/Versions.props b/eng/Versions.props index 907d9aa23..f45e82151 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-alpha.1.22609.8 - 8.0.100-alpha.1.22609.8 - 8.0.100-alpha.1.22609.8 + 8.0.100-alpha.1.22609.9 + 8.0.100-alpha.1.22609.9 + 8.0.100-alpha.1.22609.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0165be651f70c9e1a698d1cf0c3cc285238ca3b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Dec 2022 11:15:28 +0000 Subject: [PATCH 208/249] Update dependencies from https://github.com/dotnet/sdk build 20221210.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-alpha.1.22609.6 -> To Version 8.0.100-alpha.1.22610.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks From Version 17.5.0-preview-20221208-02 -> To Version 17.5.0-preview-20221209-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a34ac930..398f7cf81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e332d638f326b2ac0e3d374f4b4a8a016398d100 + c5ecaa630d4117de97e38a1c41cfacd327175d1c - + https://github.com/dotnet/sdk - e332d638f326b2ac0e3d374f4b4a8a016398d100 + c5ecaa630d4117de97e38a1c41cfacd327175d1c - + https://github.com/dotnet/sdk - e332d638f326b2ac0e3d374f4b4a8a016398d100 + c5ecaa630d4117de97e38a1c41cfacd327175d1c - + https://github.com/dotnet/sdk - e332d638f326b2ac0e3d374f4b4a8a016398d100 + c5ecaa630d4117de97e38a1c41cfacd327175d1c @@ -142,9 +142,9 @@ 8da5d535932a4143bbd8594c8a66cca686db9bfc - + https://github.com/dotnet/linker - 679459944042cda47526e839d8edce75f735d5f4 + 27ce03227f4822aaff660ec9bac6fe6c20d001d2 linker diff --git a/eng/Versions.props b/eng/Versions.props index f45e82151..5247b4bfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-alpha.1.22609.9 - 8.0.100-alpha.1.22609.9 - 8.0.100-alpha.1.22609.9 + 8.0.100-alpha.1.22610.1 + 8.0.100-alpha.1.22610.1 + 8.0.100-alpha.1.22610.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b092b02fbdfa6702c41d84a3e425b69b6e22ec9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Dec 2022 12:17:39 +0000 Subject: [PATCH 209/249] Update dependencies from https://github.com/dotnet/sdk build 20221210.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-alpha.1.22609.6 -> To Version 8.0.100-alpha.1.22610.2 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks From Version 17.5.0-preview-20221208-02 -> To Version 17.5.0-preview-20221209-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 398f7cf81..7da1cc238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c5ecaa630d4117de97e38a1c41cfacd327175d1c + e5479573ba46cc6d85059cee3632195e49e75e6d - + https://github.com/dotnet/sdk - c5ecaa630d4117de97e38a1c41cfacd327175d1c + e5479573ba46cc6d85059cee3632195e49e75e6d - + https://github.com/dotnet/sdk - c5ecaa630d4117de97e38a1c41cfacd327175d1c + e5479573ba46cc6d85059cee3632195e49e75e6d - + https://github.com/dotnet/sdk - c5ecaa630d4117de97e38a1c41cfacd327175d1c + e5479573ba46cc6d85059cee3632195e49e75e6d diff --git a/eng/Versions.props b/eng/Versions.props index 5247b4bfb..badd291ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-alpha.1.22610.1 - 8.0.100-alpha.1.22610.1 - 8.0.100-alpha.1.22610.1 + 8.0.100-alpha.1.22610.2 + 8.0.100-alpha.1.22610.2 + 8.0.100-alpha.1.22610.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc38236c64844391f212bc19e14204defb8573f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Dec 2022 13:36:13 +0000 Subject: [PATCH 210/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221209.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22607.1 -> To Version 8.0.0-alpha.1.22609.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9af823844..38643ea47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 9845ef580869dc613b301343504f8831d20f84da + bea048703a1a2a9b5f35b04660b74a63ae2520cd From 06e0c7ec4cc156b1d76e92b24f1eeb0a044717aa Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Mon, 12 Dec 2022 06:42:48 -0800 Subject: [PATCH 211/249] Merge branch 'release/7.0.2xx' => 'main' (#15120) * Merged PR 27002: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221023.15 - **Date Produced**: October 24, 2022 3:27:24 AM UTC - **Commit**: eeb998091f4302f58f636f1c75ee5150d5b940c1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][3] - ... * Update dependencies from https://github.com/dotnet/sdk build 20221023.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221023.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Merged PR 27009: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.23 - **Date Produced**: October 24, 2022 4:34:27 AM UTC - **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files [2]: https://dev... * [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/sdk build 20221024.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update TelemetryOptOutDefaultTests.cs * Update dependencies from https://github.com/dotnet/sdk build 20221024.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221024.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221024.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221025.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Remove prior verison of test. * Fix to final 3.1 build * Update dependencies from https://github.com/dotnet/sdk build 20221025.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Enable codeql * Update dependencies from https://github.com/dotnet/sdk build 20221025.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221026.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221026.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221026.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221026.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Ensure finalizer only runs when no matching SDK feature bands are installed * Update dependencies from https://github.com/dotnet/sdk build 20221027.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update branding to 7.0.101 * Refactor source-build CI triggers and pools (#14835) * Update dependencies from https://github.com/dotnet/sdk build 20221027.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221028.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221030.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * [release/7.0.1xx] Increase dotnet-watch source-build smoke test timeout (#14842) * Up timeout for dotnet-watch smoke test * Add more descriptive timeout message * Update dependencies from https://github.com/dotnet/sdk build 20221031.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update Versions.props * Update dependencies from https://github.com/dotnet/sdk build 20221101.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update branding to 6.0.112 * Update branding to 6.0.307 * Update branding to 6.0.404 * Update dependencies from https://github.com/dotnet/sdk build 20221101.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221102.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221102.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221102.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221102.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221103.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221103.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Refactor source-build CI triggers and pools (#14835) (#14878) * Update dependencies from https://github.com/dotnet/sdk build 20221104.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update source-build artifacts and tools to rc2 * Update dependencies from https://github.com/dotnet/sdk build 20221104.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Add source-build nowarns * Update dependencies from https://github.com/dotnet/sdk build 20221104.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Quick fix to unblock codeflow while I investigate further * Update dependencies from https://github.com/dotnet/sdk build 20221104.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Get the telemetry version from the --version command and use it to find dotnet.dll * Fix build error. * Update dependencies from https://github.com/dotnet/sdk build 20221106.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221106.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221107.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) * Update dependencies from https://github.com/dotnet/sdk build 20221107.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911) * Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai * Update dependencies from https://github.com/dotnet/sdk build 20221108.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221108.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * update global.json and Versions.props for .NET SDK 7.0.100 (#14933) * Update dependencies from https://github.com/dotnet/sdk build 20221108.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221108.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221108.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221031.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22504.2 -> To Version 7.0.0-alpha.1.22531.3 * Merging internal commits for release/6.0.1xx (#14926) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk * Update source-build CI to not arm64 leg on internal PRs * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk * Merged PR 26839: Ignore EOL warning for net5.0 in F#. Ignore EOL warning for net5.0 in F#. * Merged PR 26844: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.3 - **Date Produced**: October 18, 2022 5:40:56 PM UTC - **Commit**: 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd4e90ae&targetVersion=GC1b66d2b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) * Merged PR 26849: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.14 - **Date Produced**: October 19, 2022 12:13:28 AM UTC - **Commit**: f364505f98c1a6266cc3209616396c35f079e122 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1b66d2b&targetVersion=GCf364505&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7b9c4cb&targetVersion=GCd43b60f&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7a706b&targetVersion=GC1821cb5&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC8d60cc7&targetVersion=GC4e1581e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.Projec... * Merged PR 26877: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.25 - **Date Produced**: October 19, 2022 4:49:17 AM UTC - **Commit**: d2aa8e2e7c433a280775f3ab9845f5e602fb5537 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf364505&targetVersion=GCd2aa8e2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) * Merged PR 26888: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221019.5 - **Date Produced**: October 19, 2022 3:05:49 PM UTC - **Commit**: eea343b1bcf8392e2ddead88bafe9e9f18105cc2 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6][3] ... * Merged PR 26911: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221019.20 - **Date Produced**: October 19, 2022 6:59:59 PM UTC - **Commit**: c287c60f01cd4abc3efecfd992d2b8a227783900 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCeea343b&targetVersion=GCc287c60&_a=files [2]: https://dev.a... * Merged PR 26947: Also set CheckEolTargetFramework=false in F# bootstrap build. F# bootstrap build also needs this argument. * Merged PR 26995: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.10 to 6.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.4 - **Date Produced**: October 23, 2022 10:44:47 PM UTC - **Commit**: 4c81383014030abdada230e871efd72be72ea5cb - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.10 to 6.0.11][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc287c60&targetVersion=GC4c81383&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targ... * Merged PR 27003: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.14 - **Date Produced**: October 24, 2022 3:26:12 AM UTC - **Commit**: ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4][3] - **... * Merged PR 27008: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.21 - **Date Produced**: October 24, 2022 4:33:41 AM UTC - **Commit**: 8f6e48c18dda13f4ddb7b447d4602629099d3639 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCffccd7e&targetVersion=GC8f6e48c&_a=files [2]: https://dev... Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot Co-authored-by: MichaelSimons Co-authored-by: Chris Rummel * Add infra to specify custom repo nowarns to eliminate patches (#14923) * [release/6.0.4xx] Update dependencies from dotnet/arcade (#14935) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons * update global.json and Versions.props for .NET SDK 6.0.111 (#14932) * [release/6.0.1xx] Update dependencies from dotnet/arcade (#14934) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons * Update dependencies from https://github.com/dotnet/arcade build 20221108.4 (#14943) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22513.4 -> To Version 7.0.0-beta.22558.4 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/sdk build 20221109.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rc.2.22472.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * [automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#14945) * Merged PR 26791: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.21 to 6.0.403-rtm.22512.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22219.3 to 6.0.200-1.22478.1 (parent: Microsoft.NET.S... * Merged PR 26822: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221017.21 - **Date Produced**: October 17, 2022 9:51:49 PM UTC - **Commit**: d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3a5d216&targetVersion=GCd149a56&_a=files [2]: https://dev.a... * Merged PR 26841: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.2 - **Date Produced**: October 18, 2022 3:41:02 PM UTC - **Commit**: fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd149a56&targetVersion=GCfc6df71&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26855: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.24 - **Date Produced**: October 19, 2022 4:48:37 AM UTC - **Commit**: 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][6] - **VS.Redist.Common.WindowsDesktop.S... * Merged PR 26889: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.6 - **Date Produced**: October 19, 2022 3:07:02 PM UTC - **Commit**: c3805b2afca00eebe5ec3d73753070dc527329ea - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9a858ac&targetVersion=GCc3805b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcb12e45&targetVersion=GC1f92829&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26910: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.21 - **Date Produced**: October 19, 2022 6:59:31 PM UTC - **Commit**: 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc3805b2&targetVersion=GC8a2916d&_a=files [2]: https://dev.a... * Merged PR 26920: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.26 - **Date Produced**: October 19, 2022 7:55:37 PM UTC - **Commit**: ed71b196867c16a91420bcd0609de82131d11ebc - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.403 to 6.0.403][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8a2916d&targetVersion=GCed71b19&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0a0cfeb&targetVersion=GC783938a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26935: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.FSharp.Compiler**: from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.36 - **Date Produced**: October 19, 2022 10:39:51 PM UTC - **Commit**: 7c0deced9ce8988403320693522a661cdd1c7f70 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.FSharp.Compiler**: [from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCed71b19&targetVersion=GC7c0dece&_a=files [2]: https://github.com/dotnet/fsharp/compare/4438112...5d69143 [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26997: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.6 - **Date Produced**: October 23, 2022 10:48:18 PM UTC - **Commit**: 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7c0dece&targetVersion=GC8d1b1fa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 27004: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.16 - **Date Produced**: October 24, 2022 3:29:06 AM UTC - **Commit**: ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6][3] - **Microsoft.DotNet.Commo... * Merged PR 27009: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.23 - **Date Produced**: October 24, 2022 4:34:27 AM UTC - **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files [2]: https://dev... * [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911) * Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai * [release/6.0.4xx] Update dependencies from dotnet/arcade (#14935) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet Bot Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai Co-authored-by: Sean Reeser Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] * Update to .NET 7 GA MAUI manifests (#14930) These are the set of .NET 7 GA builds. After `.\build.cmd -pack -publish`, manually tested the workloads: > $env:DOTNET_MULTILEVEL_LOOKUP=0 > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk.Windows version 33.0.4... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update Installing pack Microsoft.iOS.Sdk version 16.0.1478.. ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update Installing pack Microsoft.macOS.Sdk version 12.3.2372... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update Installing pack Microsoft.MacCatalyst.Sdk version 15.4.2372... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update Installing pack Microsoft.tvOS.Sdk version 16.0.1478... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update Installing pack Microsoft.Maui.Core.Ref.android version 7.0.49... * Update dependencies from https://github.com/dotnet/sdk build 20221110.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221111.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Avoid missing signing files in zips (#14966) * Avoid missing signing files in zips * Try again with broader paths to avoid dupes * One more time * Revert unchanged * Update dependencies from https://github.com/dotnet/sdk build 20221111.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22464.1 -> To Version 6.0.0-servicing.22525.2 * Merging internal commits for release/7.0.1xx (#14931) * use mktemp to correctly use temp files * Merged PR 26816: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22511.7 to 7.0.0-rtm.22517.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22517.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.5-beta.22510.6 to 12.4.0-beta.22513.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22510.6 to 7.0.0-beta.22513.2 (... * Merged PR 26854: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-3.22514.7 to 4.4.0-3.22518.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.4.0-preview-22512-01 to 17.4.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221018.28 - **Date Produced**: October 19, 2022 6:19:08 AM UTC - **Commit**: 348f3ff5255a687223425710282e61f16cc19c7b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22517.33 to 7.0.100-rtm.22518.28][6] - **Microsoft.... * Merged PR 26890: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.3 - **Date Produced**: October 19, 2022 3:14:47 PM UTC - **Commit**: 149c427f8260d998e3c77012d2da361d649bf573 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0 to 7.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-dev-certs**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-jwts**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-secrets**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8b2d10a&targetVersion=GC149c427&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC2d456a1&targetVersion=GCbb01bbf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (En... * Merged PR 26893: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.9 - **Date Produced**: October 19, 2022 4:16:20 PM UTC - **Commit**: 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC149c427&targetVersion=GC8f23e14&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26897: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.13 - **Date Produced**: October 19, 2022 5:31:15 PM UTC - **Commit**: f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f23e14&targetVersion=GCf1a8727&_a=fil... * Merged PR 26919: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Test.Sdk**: from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.25 - **Date Produced**: October 19, 2022 7:42:39 PM UTC - **Commit**: 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Test.Sdk**: [from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf1a8727&targetVersion=GC78ffdbb&_a=files [2]: https://github.com/microsoft/vstest/compare/576a7cc...c02ece8 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26934: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.FSharp.Compiler**: from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.32 - **Date Produced**: October 19, 2022 10:14:41 PM UTC - **Commit**: 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC78ffdbb&targetVersion=GC513aacc&_a=files [2]: https://github.com/dotnet/fsharp/compare/e142005...c370ee0 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26943: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.39 - **Date Produced**: October 20, 2022 1:19:35 AM UTC - **Commit**: 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC513aacc&targetVersion=GC6efaab2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26944: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-3.22518.13 to 4.4.0-4.22519.21 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.46 - **Date Produced**: October 20, 2022 6:38:33 AM UTC - **Commit**: 962460f12e44a2931544e5ec1c55d9ea99b99f21 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-3.22518.13 to 4.4.0-4.22519.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6efaab2&targetVersion=GC962460f&_a=files [2]: https://github.com/dotnet/roslyn/compare/7856a68...df3e083 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221020.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk Co-authored-by: Noah Gilson Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot * Fix missing cross-genning (#14967) * Fix missing cross-genning Cross-genning got missed because the paths were hardcoded. Instead, use properties and a "default TFM". Also introduce checking to ensure that we don't miss cross-genning in common cases. * Don't error when no WD found * Update dependencies from https://github.com/dotnet/sdk build 20221112.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221113.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221113.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221113.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221114.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update asp.net templates (#14957) * Update asp.net templates (#14958) * Update asp.net templates (#14959) * Update dependencies from https://github.com/dotnet/arcade build 20221111.2 (#14983) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#14987) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/arcade build 20221111.2 (#14982) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/arcade build 20221111.1 (#14990) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/sdk build 20221114.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221114.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk * Fixup source-build incorrect merges * Update source-build version.details.xml metadata * Enabled source-building with mono runtime on any architecture. (#14792) * Enabled source-building with mono runtime on any architecture. Adds an argument to the top-level build script to use the mono runtime, and sets the flags needed for the different repos to work with mono. * Sync with sdk patch. * Remove patches. * PR feedback. * Add aspnetcore patch to workaround roslyn-analyzers issue * Source-build fixups * The mono manifests are 7.0.0 so updating to the final emsdk version as well. * Add dotnet/format patch * Update source-build previous artifacts * Disable broken test - noted with follow-up issue * Update Windows SDK projection * Update dependencies from https://github.com/dotnet/sdk build 20221115.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 * Update dependencies from https://github.com/dotnet/sdk build 20221116.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 * [release/7.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#14766) [release/7.0.2xx] Update dependencies from dotnet/source-build-reference-packages * Update dependencies from https://github.com/dotnet/sdk build 20221116.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.22563.3 -> To Version 12.5.0-beta.22565.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221117.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 * Update dependencies from https://github.com/dotnet/sdk build 20221117.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22564-01 -> To Version 17.5.0-preview-22567-01 (parent: Microsoft.NET.Sdk * [release/7.0.1xx] Add CI for security-partners-dotnet (#15007) * Add CI for dotnet-security-partners Remove nuget configs from all repo submodules Address code review Move security-partners ci to tarball/eng dir Copy out installer NuGet config before build Fix relative path for installer template Switch to 20.04 image * Add nuget-client patch to avoid nuget security scan errors * Revert "Add nuget-client patch to avoid nuget security scan errors" This reverts commit 6eca00a41813171019b24597386a9074e2faa07b. * Remove NuGet.config workaround for security-partners ci * Update dependencies from https://github.com/dotnet/sdk build 20221117.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22567-01 -> To Version 17.5.0-preview-22567-05 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221117.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.22565.3 -> To Version 12.5.0-beta.22567.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221118.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.88 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221118.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221118.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221118.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22570.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22570.1 * Update dependencies from https://github.com/dotnet/sdk build 20221120.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22569.1 (parent: Microsoft.NET.Sdk * Revert "Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1" (#15027) This reverts commit 769d0524d73ba66d256168d00661d96fb86a9903. * Add patch for XDT prebuilt in nuget-client * Update dependencies from https://github.com/dotnet/sdk build 20221121.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221122.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221123.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221123.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221123.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221124.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20221122.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22561.2 -> To Version 7.0.0-beta.22572.6 * Update dependencies from https://github.com/dotnet/sdk build 20221124.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221124.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221125.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221127.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221127.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk * Revert "Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1" (#15029) This reverts commit df2279cc39a53577a2cc24f46b4cb781f620df9d. * Override some versions for nonshipping runtime packages. (#15045) Source-build 7.0.0 created these packages with an incorrect version number which is stuckthe previously-source-built PVP for the 7.0.1 release. This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails. This change allows us to override the version read out of PVP and set it to the actual version used by runtime. * Update dependencies from https://github.com/dotnet/sdk build 20221128.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221128.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221129.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk * Use non-stable branding (#15049) * Update dependencies from https://github.com/dotnet/sdk build 20221129.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221129.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200-preview.22579.38 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk * Update nuget-client patch with more props * Add CS9057 nowarn to nuget-client for source-build * Update dependencies from https://github.com/dotnet/sdk build 20221129.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22579.38 -> To Version 7.0.200-preview.22579.55 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22578-03 -> To Version 17.5.0-preview-22580-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221130.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22579.55 -> To Version 7.0.200-preview.22580.20 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221128-04 -> To Version 17.5.0-preview-20221130-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20221130.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22572.6 -> To Version 7.0.0-beta.22580.5 * Update dependencies from https://github.com/dotnet/sdk build 20221130.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.20 -> To Version 7.0.200-preview.22580.38 * Update dependencies from https://github.com/dotnet/sdk build 20221130.54 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.38 -> To Version 7.0.200-preview.22580.54 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.22578.1 -> To Version 12.5.0-beta.22580.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221201.1 (#15076) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22601.1 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/arcade build 20221201.3 (#15081) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22580.5 -> To Version 7.0.0-beta.22601.3 Co-authored-by: dotnet-maestro[bot] * Update the implicit versions to match the December release * Update dependencies from https://github.com/dotnet/arcade build 20221201.6 (#15088) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22601.3 -> To Version 7.0.0-beta.22601.6 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221208.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22601.1 -> To Version 7.0.0-alpha.1.22608.2 * Revert the changes to the GenerateBundledVersions file Co-authored-by: DotNet Bot Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine Co-authored-by: Jacques Eloff Co-authored-by: Sean Reeser Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: dotnet-maestro-bot Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: Chris Rummel Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers Co-authored-by: Noah Gilson Co-authored-by: William Godbe Co-authored-by: Tom Deseyn Co-authored-by: Manodasan Wignarajah Co-authored-by: v-amyang <87839782+v-amyang@users.noreply.github.com> --- .vsts-ci.yml | 2 + NuGet.config | 2 + README.md | 8 +- eng/ManualVersions.props | 12 +-- eng/Signing.props | 9 +-- eng/SourceBuild.props | 1 + src/SourceBuild/tarball/content/build.sh | 4 + .../bootstrap/OverrideBootstrapVersions.props | 11 +++ .../buildBootstrapPreviouslySB.csproj | 1 + .../pipelines/security-partners-dotnet.yml | 18 +++++ src/SourceBuild/tarball/content/prep.sh | 2 +- .../content/repos/Directory.Build.props | 1 + .../tarball/content/repos/fsharp.proj | 1 + .../tarball/content/repos/installer.proj | 5 ++ .../DotNetHelper.cs | 6 +- .../DotNetWatchTests.cs | 10 +-- .../ExecuteHelper.cs | 2 +- ...solvePackageFileConflicts-workaround.patch | 23 ++++++ .../0003-Address-obsolete-errors.patch | 24 ++++++ ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 +++++++++ src/finalizer/finalizer.cpp | 17 +++- src/redist/targets/Crossgen.targets | 57 +++++++++++--- .../targets/GetRuntimeInformation.targets | 16 ++-- src/redist/targets/packaging/deb/postinst | 3 +- .../packaging/osx/clisdk/scripts/postinstall | 2 +- .../packaging/windows/clisdk/bundle.wxs | 41 ++++++---- test/EndToEnd/EndToEnd.Tests.csproj | 1 + test/EndToEnd/GivenFrameworkDependentApps.cs | 67 ++++++++-------- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 24 ++++++ .../AssemblyInfo.cs | 78 +++++++++++++++++++ 30 files changed, 388 insertions(+), 96 deletions(-) create mode 100644 src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch create mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch create mode 100644 test/EndToEnd/TelemetryOptOutDefaultTests.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs diff --git a/.vsts-ci.yml b/.vsts-ci.yml index bfa95549e..7e9bc79af 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -33,6 +33,8 @@ variables: - name: PostBuildSign value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines diff --git a/NuGet.config b/NuGet.config index 08a242e88..cb866adcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,6 +32,8 @@ + + diff --git a/README.md b/README.md index 4a1955267..c56604d4a 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ Please see the [dotnet/source-build](https://github.com/dotnet/source-build) rep ## Support -.NET Source-Build is supported on the oldest available .NET SDK feature update, and on Linux only. -For example, if both .NET 6.0.1XX and 6.0.2XX feature updates are available from [dotnet.microsoft.com](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), Source-Build will only support 6.0.1XX. +.NET Source-Build is supported on the oldest available .NET SDK feature update for each major release, and on Linux only. +For example, if .NET 6.0.1xx, 6.0.2xx, and 7.0.1xx feature updates are available from [dotnet.microsoft.com](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), Source-Build will support 6.0.1xx and 7.0.1xx. For the latest information about Source-Build support for new .NET versions, please check our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions) for announcements. ## Prerequisites @@ -88,7 +88,7 @@ The dependencies for building .NET from source can be found [here](https://githu ``` This builds the entire .NET SDK from source. - The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz`. + The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-7.0.100-your-RID.tar.gz`. Optionally add the `--online` flag to add online NuGet restore sources to the build. This is useful for testing unsupported releases that don't yet build without downloading pre-built binaries from the internet. @@ -99,7 +99,7 @@ The dependencies for building .NET from source can be found [here](https://githu ```bash mkdir -p $HOME/dotnet - tar zxf artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz -C $HOME/dotnet + tar zxf artifacts/x64/Release/dotnet-sdk-7.0.100-your-RID.tar.gz -C $HOME/dotnet ln -s $HOME/dotnet/dotnet /usr/bin/dotnet ``` diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a..2bf456f30 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 diff --git a/eng/Signing.props b/eng/Signing.props index 3a2373f9e..0d49f78d1 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,12 +7,9 @@ - - - - - - + + + diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index a2831d574..9ebca97ff 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,6 +11,7 @@ $(InnerBuildArgs) /p:IncludeNuGetPackageArchive=false $(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false $(InnerBuildArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false + $(InnerBuildArgs) /p:DISABLE_CROSSGEN=true diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index b6056a426..a6ea077ff 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -9,6 +9,7 @@ usage() { echo " --online build using online sources" echo " --poison build with poisoning checks" echo " --run-smoke-test don't build; run smoke tests" + echo " --use-mono-runtime output uses the mono runtime" echo " --with-packages use the specified directory of previously-built packages" echo " --with-sdk use the SDK in the specified directory for bootstrapping" echo "use -- to send the remaining arguments to MSBuild" @@ -45,6 +46,9 @@ while :; do runningSmokeTests=true MSBUILD_ARGUMENTS+=( "-t:RunSmokeTest" ) ;; + --use-mono-runtime) + MSBUILD_ARGUMENTS+=( "/p:SourceBuildUseMonoRuntime=true" ) + ;; --with-packages) CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)" if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props new file mode 100644 index 000000000..d0a05029f --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -0,0 +1,11 @@ + + + + 7.0.0-rtm.22518.5 + + $(NonshippingRuntimeVersionFor700) + $(NonshippingRuntimeVersionFor700) + $(NonshippingRuntimeVersionFor700) + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 9a00e2a48..a22d70373 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -2,6 +2,7 @@ + net7.0 diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..69bef21e9 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,18 @@ +trigger: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu2004-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e348e1dcc..c90dab9ac 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -121,7 +121,7 @@ if [ "$buildBootstrap" == "true" ]; then fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" # Remove working directory rm -rf $workingDir diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e4e3060af..04ab89d11 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -143,6 +143,7 @@ $(StandardSourceBuildArgs) /p:AdditionalSourceBuiltNupkgCacheDir="$(SourceBuiltPackagesPath)" $(StandardSourceBuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)" $(StandardSourceBuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)" + $(StandardSourceBuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) $(ProjectDirectory)\build$(ShellExtension) diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index bc9a10be7..3ffd14406 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,6 +27,7 @@ + osx-x64 $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) + + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) + $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) + --runtime-id $(OverrideTargetRid) --runtime-id $(TargetRid) @@ -22,6 +26,7 @@ --> $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 $(BuildCommandArgs) /p:OSName=$(OSNameOverride) + $(BuildCommandArgs) /p:PortableOSName=$(PortableOS) $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ae5508aa4..921ab1f97 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -96,7 +96,7 @@ internal class DotNetHelper } } - public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int? expectedExitCode = 0, int millisecondTimeout = -1) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, @@ -105,7 +105,9 @@ internal class DotNetHelper configure: (process) => configureProcess(process, workingDirectory), millisecondTimeout: millisecondTimeout); - ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); + if (expectedExitCode != null) { + ExecuteHelper.ValidateExitCode(executeResult, (int) expectedExitCode); + } void configureProcess(Process process, string? workingDirectory) { diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index f2dc2a75b..4c5a9c425 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,20 +13,18 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - // TODO: Re-enable https://github.com/dotnet/source-build/issues/2961 - // [Fact] + //[Fact] - Renable with https://github.com/dotnet/source-build/issues/3123 public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); bool outputChanged = false; - // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually DotNetHelper.ExecuteCmd( "watch run", workingDirectory: projectDirectory, additionalProcessConfigCallback: processConfigCallback, - expectedExitCode: 143, - millisecondTimeout: 30000); + expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly + millisecondTimeout: 60000); Assert.True(outputChanged); @@ -53,7 +51,7 @@ public class DotNetWatchTests : SmokeTests { outputChanged = true; OutputHelper.WriteLine("Successfully re-ran program after code change."); - ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + process.Kill(true); } }); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 570b5accb..b8b4e7d8d 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -70,7 +70,7 @@ internal static class ExecuteHelper if (!process.HasExited) { - outputHelper.WriteLine($"Killing: {fileName} {args}"); + outputHelper.WriteLine($"Process did not exit. Killing {fileName} {args} after waiting {millisecondTimeout} milliseconds."); process.Kill(true); process.WaitForExit(); } diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch new file mode 100644 index 000000000..ab355630e --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 11 Nov 2022 21:10:54 +0000 +Subject: [PATCH] ResolvePackageFileConflicts workaround + +--- + .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +index 3b5d2ae950..f92fb421fe 100644 +--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj ++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + ++ ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch new file mode 100644 index 000000000..b98759d70 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 27 Oct 2022 02:47:08 +0000 +Subject: [PATCH] Address obsolete errors + +Backport: https://github.com/dotnet/aspnetcore/pull/44734 +--- + src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +index f31880e891..fc6322dd41 100644 +--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs ++++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +@@ -252,9 +252,6 @@ public class KestrelServerOptions + writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); + writer.WriteBooleanValue(AllowResponseHeaderCompression); + +- writer.WritePropertyName(nameof(EnableAltSvc)); +- writer.WriteBooleanValue(EnableAltSvc); +- + writer.WritePropertyName(nameof(IsDevCertLoaded)); + writer.WriteBooleanValue(IsDevCertLoaded); + diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch new file mode 100644 index 000000000..e8b8f38fd --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 15 Nov 2022 17:34:00 +0000 +Subject: [PATCH] Address Microsoft.Build.Locator prebuilt + +Backport: https://github.com/dotnet/format/issues/1759 +--- + Directory.Packages.props | 2 +- + eng/Versions.props | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index c4bf3cf..f7e85b2 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -10,7 +10,7 @@ + + + +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index fcd583b..2933963 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -14,6 +14,7 @@ + + + 17.3.0-preview-22302-02 ++ 1.5.5 + 3.3.3 + 7.0.0-rc.1.22426.10 + diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index c8f5eca6b..d68418b9b 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -447,7 +447,17 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec LogStringLine(REPORT_STANDARD, "Scanning %ls", sczInstalledSdkVersionsKeyName); hr = RegOpen(HKEY_LOCAL_MACHINE, sczInstalledSdkVersionsKeyName, KEY_READ, &hkInstalledSdkVersionsKey); - ExitOnFailure(hr, "Failed to read installed versions key."); + + // When the last SDK is removed the registry key should no longer exist so we can just exit + if (E_FILENOTFOUND == hr) + { + LogStringLine(REPORT_STANDARD, "Registry key not found: %ls.", sczInstalledSdkVersionsKeyName); + hr = S_OK; + *pbInstalled = FALSE; + goto LExit; + } + + ExitOnFailure(hr, "Failed to open registry key: %ls.", sczInstalledSdkVersionsKeyName); for (DWORD dwSdkVersionsValueIndex = 0;; ++dwSdkVersionsValueIndex) { @@ -509,9 +519,10 @@ int wmain(int argc, wchar_t* argv[]) hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); - if (!bSdkFeatureBandInstalled) + // If the feature band is still present, do not remove workloads. + if (bSdkFeatureBandInstalled) { - LogStringLine(REPORT_STANDARD, "SDK with feature band %ls could not be found.", sczFeatureBandVersion); + LogStringLine(REPORT_STANDARD, "Detected SDK with feature band %ls.", sczFeatureBandVersion); goto LExit; } diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 6279fe883..9f4da5dc4 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -29,7 +29,27 @@ BuildInParallel="False" Projects="@(CrossGenDownloadPackageProject)"> - + + + + net8.0 + + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.ILLink.Tasks\tools\net7.0\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Worker\tools\$(DefaultToolTfm)\ + + @@ -49,16 +69,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -121,6 +141,21 @@ false + + + + + + + + + + + + + + + osx freebsd linux - + + $(Rid.Substring(0, $(Rid.LastIndexOf('-')))) $(HostOSName) - $(OSName)-$(Architecture) + $(OSName) + + $(OSName)-$(Architecture) + + $(PortableOSName)-$(Architecture) @@ -24,12 +29,9 @@ - $(Rid) - $(OSName)-$(Architecture) + $(Rid) - $(HostOSName)-$(Architecture) + $(PortableRid) dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 615c17e6b..696ec8acc 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -4,6 +4,5 @@ first_run() { /usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true } -INSTALL_TEMP_HOME=/tmp/dotnet-installer -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run diff --git a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall index 28339be99..86710223d 100644 --- a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall +++ b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall @@ -12,7 +12,7 @@ first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run exit 0 diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 346e66d75..bac843303 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -151,7 +151,31 @@ - + + + + + @@ -208,20 +232,7 @@ - - + diff --git a/test/EndToEnd/EndToEnd.Tests.csproj b/test/EndToEnd/EndToEnd.Tests.csproj index 56776d61d..278ac08fd 100644 --- a/test/EndToEnd/EndToEnd.Tests.csproj +++ b/test/EndToEnd/EndToEnd.Tests.csproj @@ -1,6 +1,7 @@  $(CoreSdkTargetFramework) + $(DefineConstants);LINUX_PORTABLE diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs index 13cafcf7a..0d30abdac 100644 --- a/test/EndToEnd/GivenFrameworkDependentApps.cs +++ b/test/EndToEnd/GivenFrameworkDependentApps.cs @@ -47,39 +47,44 @@ namespace EndToEnd internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion) { - var testProjectCreator = new TestProjectCreator() - { - PackageName = packageName, - MinorVersion = minorVersion, - }; - - var _testInstance = testProjectCreator.Create(); - - string projectDirectory = _testInstance.Root.FullName; - - string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj"); - - // Get the resolved version of .NET Core - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); - - string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); - var assetsFile = new LockFileFormat().Read(assetsFilePath); - - var versionInAssertsJson = GetPackageVersion(assetsFile, packageName); - versionInAssertsJson.Should().NotBeNull(); - - if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0) - { - // if the bundled version is, for example, a prerelease of - // .NET Core 2.1.1, that we don't roll forward to that prerelease - // version for framework-dependent deployments. + // https://github.com/NuGet/Home/issues/8571 + #if LINUX_PORTABLE return; - } + #else + var testProjectCreator = new TestProjectCreator() + { + PackageName = packageName, + MinorVersion = minorVersion, + }; - versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion)); + var _testInstance = testProjectCreator.Create(); + + string projectDirectory = _testInstance.Root.FullName; + + string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj"); + + // Get the resolved version of .NET Core + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); + var assetsFile = new LockFileFormat().Read(assetsFilePath); + + var versionInAssertsJson = GetPackageVersion(assetsFile, packageName); + versionInAssertsJson.Should().NotBeNull(); + + if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0) + { + // if the bundled version is, for example, a prerelease of + // .NET Core 2.1.1, that we don't roll forward to that prerelease + // version for framework-dependent deployments. + return; + } + + versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion)); + #endif } private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs new file mode 100644 index 000000000..1e2d2ecef --- /dev/null +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -0,0 +1,24 @@ +using System.IO; +using FluentAssertions; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace EndToEnd.Tests +{ + public class TelemetryOptOutDefault : TestBase + { + [Fact] + public void TelemetryOptOutDefaultAttribute() + { + var versionCommand = new DotnetCommand() + .ExecuteWithCapturedOutput("--version"); + + var sdkVersion = versionCommand.StdOut.Trim(); + + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", sdkVersion); + + var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); + result.Should().Contain("TelemetryOptOutDefault:False"); + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs new file mode 100644 index 000000000..f02cfbeb3 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection.Metadata; +using System.Reflection.PortableExecutable; +using System.Text; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public static class AssemblyInfo + { + public static IList Get(string assemblyPath, string assemblyInfoName) + { + var list = new List(); + + using (var stream = File.OpenRead(assemblyPath)) + using (var peReader = new PEReader(stream)) + { + var metadataReader = peReader.GetMetadataReader(); + var assemblyDefinition = metadataReader.GetAssemblyDefinition(); + + foreach (var handle in assemblyDefinition.GetCustomAttributes()) + { + var attribute = metadataReader.GetCustomAttribute(handle); + var constructor = metadataReader.GetMemberReference((MemberReferenceHandle)attribute.Constructor); + var type = metadataReader.GetTypeReference((TypeReferenceHandle)constructor.Parent); + var name = metadataReader.GetString(type.Name); + + if (name.Equals(assemblyInfoName)) + { + var signature = metadataReader.GetBlobReader(constructor.Signature); + var value = metadataReader.GetBlobReader(attribute.Value); + var header = signature.ReadSignatureHeader(); + + const ushort prolog = 1; // two-byte "prolog" defined by ECMA-335 (II.23.3) to be at the beginning of attribute value blobs + if (value.ReadUInt16() != prolog || header.Kind != SignatureKind.Method || header.IsGeneric) + { + throw new BadImageFormatException(); + } + + var paramCount = signature.ReadCompressedInteger(); + if (paramCount <= 0 || // must have at least 1 parameter + signature.ReadSignatureTypeCode() != SignatureTypeCode.Void) // return type must be void + { + continue; + } + + var sb = new StringBuilder(); + while (paramCount > 0 && sb != null) + { + switch (signature.ReadSignatureTypeCode()) + { + case SignatureTypeCode.String: + sb.Append(value.ReadSerializedString()); + break; + default: + sb = null; + break; + } + + paramCount--; + if (paramCount != 0) + { + sb?.Append(':'); + } + } + + if (sb != null) + { + list.Add(sb.ToString()); + } + } + } + } + return list; + } + } +} From 27e87715f2cf715646f7351783dfb7ec36439590 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 11:24:47 -0500 Subject: [PATCH 212/249] [main] Update dependencies from dotnet/arcade (#15110) * Update dependencies from https://github.com/dotnet/arcade build 20221208.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22606.1 -> To Version 8.0.0-beta.22608.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22605.1 -> To Version 1.0.0-beta.22607.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20221209.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22606.1 -> To Version 8.0.0-beta.22609.3 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22605.1 -> To Version 1.0.0-beta.22607.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20221212.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22606.1 -> To Version 8.0.0-beta.22612.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22605.1 -> To Version 1.0.0-beta.22611.1 (parent: Microsoft.DotNet.Arcade.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 +- eng/Versions.props | 2 +- eng/common/cross/arm/tizen-build-rootfs.sh | 35 ---- eng/common/cross/arm/tizen-fetch.sh | 170 ----------------- eng/common/cross/arm64/tizen-fetch.sh | 170 ----------------- eng/common/cross/armel/tizen-build-rootfs.sh | 35 ---- eng/common/cross/armel/tizen-fetch.sh | 170 ----------------- eng/common/cross/build-rootfs.sh | 2 +- .../cross/{arm64 => }/tizen-build-rootfs.sh | 32 +++- eng/common/cross/tizen-fetch.sh | 172 ++++++++++++++++++ eng/common/cross/toolchain.cmake | 6 +- global.json | 4 +- 12 files changed, 218 insertions(+), 596 deletions(-) delete mode 100644 eng/common/cross/arm/tizen-build-rootfs.sh delete mode 100644 eng/common/cross/arm/tizen-fetch.sh delete mode 100644 eng/common/cross/arm64/tizen-fetch.sh delete mode 100755 eng/common/cross/armel/tizen-build-rootfs.sh delete mode 100755 eng/common/cross/armel/tizen-fetch.sh rename eng/common/cross/{arm64 => }/tizen-build-rootfs.sh (55%) create mode 100644 eng/common/cross/tizen-fetch.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 002f2853c..9f7152688 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 513428e6a7a61bc5f4efd82afee219e90df51bfe + cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade - 513428e6a7a61bc5f4efd82afee219e90df51bfe + cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade - 513428e6a7a61bc5f4efd82afee219e90df51bfe + cb37e1f67041bfc6484ec47525bda461606efe92 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - 0d65aa8023efa85de4945c07e7dc8a0f7992260c + e3a6aaa38a3ad2284de2d50ff65ae4a8916db003 diff --git a/eng/Versions.props b/eng/Versions.props index badd291ce..ffdc48d6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22606.1 + 8.0.0-beta.22612.4 diff --git a/eng/common/cross/arm/tizen-build-rootfs.sh b/eng/common/cross/arm/tizen-build-rootfs.sh deleted file mode 100644 index 9fdb32e92..000000000 --- a/eng/common/cross/arm/tizen-build-rootfs.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -set -e - -__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen" - -if [[ -z "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR is not defined." - exit 1; -fi - -TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp -mkdir -p $TIZEN_TMP_DIR - -# Download files -echo ">>Start downloading files" -VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR -echo "<>Start constructing Tizen rootfs" -TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` -cd $ROOTFS_DIR -for f in $TIZEN_RPM_FILES; do - rpm2cpio $f | cpio -idm --quiet -done -echo "<>Start configuring Tizen rootfs" -ln -sfn asm-arm ./usr/include/asm -patch -p1 < $__TIZEN_CROSSDIR/tizen.patch -echo "</dev/null; then - VERBOSE=0 -fi - -Log() -{ - if [ $VERBOSE -ge $1 ]; then - echo ${@:2} - fi -} - -Inform() -{ - Log 1 -e "\x1B[0;34m$@\x1B[m" -} - -Debug() -{ - Log 2 -e "\x1B[0;32m$@\x1B[m" -} - -Error() -{ - >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" -} - -Fetch() -{ - URL=$1 - FILE=$2 - PROGRESS=$3 - if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then - CURL_OPT="--progress-bar" - else - CURL_OPT="--silent" - fi - curl $CURL_OPT $URL > $FILE -} - -hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } -hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } -hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } - -TMPDIR=$1 -if [ ! -d $TMPDIR ]; then - TMPDIR=./tizen_tmp - Debug "Create temporary directory : $TMPDIR" - mkdir -p $TMPDIR -fi - -TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen -BUILD_XML=build.xml -REPOMD_XML=repomd.xml -PRIMARY_XML=primary.xml -TARGET_URL="http://__not_initialized" - -Xpath_get() -{ - XPATH_RESULT='' - XPATH=$1 - XML_FILE=$2 - RESULT=$(xmllint --xpath $XPATH $XML_FILE) - if [[ -z ${RESULT// } ]]; then - Error "Can not find target from $XML_FILE" - Debug "Xpath = $XPATH" - exit 1 - fi - XPATH_RESULT=$RESULT -} - -fetch_tizen_pkgs_init() -{ - TARGET=$1 - PROFILE=$2 - Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" - - TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs - if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi - mkdir -p $TMP_PKG_DIR - - PKG_URL=$TIZEN_URL/$PROFILE/latest - - BUILD_XML_URL=$PKG_URL/$BUILD_XML - TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML - TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML - TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML - TMP_PRIMARYGZ=${TMP_PRIMARY}.gz - - Fetch $BUILD_XML_URL $TMP_BUILD - - Debug "fetch $BUILD_XML_URL to $TMP_BUILD" - - TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" - Xpath_get $TARGET_XPATH $TMP_BUILD - TARGET_PATH=$XPATH_RESULT - TARGET_URL=$PKG_URL/$TARGET_PATH - - REPOMD_URL=$TARGET_URL/repodata/repomd.xml - PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' - - Fetch $REPOMD_URL $TMP_REPOMD - - Debug "fetch $REPOMD_URL to $TMP_REPOMD" - - Xpath_get $PRIMARY_XPATH $TMP_REPOMD - PRIMARY_XML_PATH=$XPATH_RESULT - PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH - - Fetch $PRIMARY_URL $TMP_PRIMARYGZ - - Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" - - gunzip $TMP_PRIMARYGZ - - Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" -} - -fetch_tizen_pkgs() -{ - ARCH=$1 - PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' - - PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' - - for pkg in ${@:2} - do - Inform "Fetching... $pkg" - XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - PKG_PATH=$XPATH_RESULT - - XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - CHECKSUM=$XPATH_RESULT - - PKG_URL=$TARGET_URL/$PKG_PATH - PKG_FILE=$(basename $PKG_PATH) - PKG_PATH=$TMPDIR/$PKG_FILE - - Debug "Download $PKG_URL to $PKG_PATH" - Fetch $PKG_URL $PKG_PATH true - - echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null - if [ $? -ne 0 ]; then - Error "Fail to fetch $PKG_URL to $PKG_PATH" - Debug "Checksum = $CHECKSUM" - exit 1 - fi - done -} - -Inform "Initialize arm base" -fetch_tizen_pkgs_init standard Tizen-Base -Inform "fetch common packages" -fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils -Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel - -Inform "Initialize standard unified" -fetch_tizen_pkgs_init standard Tizen-Unified -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release - diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh deleted file mode 100644 index 785bd8548..000000000 --- a/eng/common/cross/arm64/tizen-fetch.sh +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then - VERBOSE=0 -fi - -Log() -{ - if [ $VERBOSE -ge $1 ]; then - echo ${@:2} - fi -} - -Inform() -{ - Log 1 -e "\x1B[0;34m$@\x1B[m" -} - -Debug() -{ - Log 2 -e "\x1B[0;32m$@\x1B[m" -} - -Error() -{ - >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" -} - -Fetch() -{ - URL=$1 - FILE=$2 - PROGRESS=$3 - if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then - CURL_OPT="--progress-bar" - else - CURL_OPT="--silent" - fi - curl $CURL_OPT $URL > $FILE -} - -hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } -hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } -hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } - -TMPDIR=$1 -if [ ! -d $TMPDIR ]; then - TMPDIR=./tizen_tmp - Debug "Create temporary directory : $TMPDIR" - mkdir -p $TMPDIR -fi - -TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen -BUILD_XML=build.xml -REPOMD_XML=repomd.xml -PRIMARY_XML=primary.xml -TARGET_URL="http://__not_initialized" - -Xpath_get() -{ - XPATH_RESULT='' - XPATH=$1 - XML_FILE=$2 - RESULT=$(xmllint --xpath $XPATH $XML_FILE) - if [[ -z ${RESULT// } ]]; then - Error "Can not find target from $XML_FILE" - Debug "Xpath = $XPATH" - exit 1 - fi - XPATH_RESULT=$RESULT -} - -fetch_tizen_pkgs_init() -{ - TARGET=$1 - PROFILE=$2 - Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" - - TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs - if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi - mkdir -p $TMP_PKG_DIR - - PKG_URL=$TIZEN_URL/$PROFILE/latest - - BUILD_XML_URL=$PKG_URL/$BUILD_XML - TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML - TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML - TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML - TMP_PRIMARYGZ=${TMP_PRIMARY}.gz - - Fetch $BUILD_XML_URL $TMP_BUILD - - Debug "fetch $BUILD_XML_URL to $TMP_BUILD" - - TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" - Xpath_get $TARGET_XPATH $TMP_BUILD - TARGET_PATH=$XPATH_RESULT - TARGET_URL=$PKG_URL/$TARGET_PATH - - REPOMD_URL=$TARGET_URL/repodata/repomd.xml - PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' - - Fetch $REPOMD_URL $TMP_REPOMD - - Debug "fetch $REPOMD_URL to $TMP_REPOMD" - - Xpath_get $PRIMARY_XPATH $TMP_REPOMD - PRIMARY_XML_PATH=$XPATH_RESULT - PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH - - Fetch $PRIMARY_URL $TMP_PRIMARYGZ - - Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" - - gunzip $TMP_PRIMARYGZ - - Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" -} - -fetch_tizen_pkgs() -{ - ARCH=$1 - PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' - - PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' - - for pkg in ${@:2} - do - Inform "Fetching... $pkg" - XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - PKG_PATH=$XPATH_RESULT - - XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - CHECKSUM=$XPATH_RESULT - - PKG_URL=$TARGET_URL/$PKG_PATH - PKG_FILE=$(basename $PKG_PATH) - PKG_PATH=$TMPDIR/$PKG_FILE - - Debug "Download $PKG_URL to $PKG_PATH" - Fetch $PKG_URL $PKG_PATH true - - echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null - if [ $? -ne 0 ]; then - Error "Fail to fetch $PKG_URL to $PKG_PATH" - Debug "Checksum = $CHECKSUM" - exit 1 - fi - done -} - -Inform "Initialize arm64 base" -fetch_tizen_pkgs_init standard Tizen-Base -Inform "fetch common packages" -fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils -Inform "fetch coreclr packages" -fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu -Inform "fetch corefx packages" -fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel - -Inform "Initialize standard unified" -fetch_tizen_pkgs_init standard Tizen-Unified -Inform "fetch corefx packages" -fetch_tizen_pkgs aarch64 gssdp gssdp-devel tizen-release - diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh deleted file mode 100755 index 9a4438af6..000000000 --- a/eng/common/cross/armel/tizen-build-rootfs.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -set -e - -__ARM_SOFTFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__TIZEN_CROSSDIR="$__ARM_SOFTFP_CrossDir/tizen" - -if [[ -z "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR is not defined." - exit 1; -fi - -TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp -mkdir -p $TIZEN_TMP_DIR - -# Download files -echo ">>Start downloading files" -VERBOSE=1 $__ARM_SOFTFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR -echo "<>Start constructing Tizen rootfs" -TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` -cd $ROOTFS_DIR -for f in $TIZEN_RPM_FILES; do - rpm2cpio $f | cpio -idm --quiet -done -echo "<>Start configuring Tizen rootfs" -ln -sfn asm-arm ./usr/include/asm -patch -p1 < $__TIZEN_CROSSDIR/tizen.patch -echo "</dev/null; then - VERBOSE=0 -fi - -Log() -{ - if [ $VERBOSE -ge $1 ]; then - echo ${@:2} - fi -} - -Inform() -{ - Log 1 -e "\x1B[0;34m$@\x1B[m" -} - -Debug() -{ - Log 2 -e "\x1B[0;32m$@\x1B[m" -} - -Error() -{ - >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" -} - -Fetch() -{ - URL=$1 - FILE=$2 - PROGRESS=$3 - if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then - CURL_OPT="--progress-bar" - else - CURL_OPT="--silent" - fi - curl $CURL_OPT $URL > $FILE -} - -hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } -hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } -hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } - -TMPDIR=$1 -if [ ! -d $TMPDIR ]; then - TMPDIR=./tizen_tmp - Debug "Create temporary directory : $TMPDIR" - mkdir -p $TMPDIR -fi - -TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen -BUILD_XML=build.xml -REPOMD_XML=repomd.xml -PRIMARY_XML=primary.xml -TARGET_URL="http://__not_initialized" - -Xpath_get() -{ - XPATH_RESULT='' - XPATH=$1 - XML_FILE=$2 - RESULT=$(xmllint --xpath $XPATH $XML_FILE) - if [[ -z ${RESULT// } ]]; then - Error "Can not find target from $XML_FILE" - Debug "Xpath = $XPATH" - exit 1 - fi - XPATH_RESULT=$RESULT -} - -fetch_tizen_pkgs_init() -{ - TARGET=$1 - PROFILE=$2 - Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" - - TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs - if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi - mkdir -p $TMP_PKG_DIR - - PKG_URL=$TIZEN_URL/$PROFILE/latest - - BUILD_XML_URL=$PKG_URL/$BUILD_XML - TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML - TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML - TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML - TMP_PRIMARYGZ=${TMP_PRIMARY}.gz - - Fetch $BUILD_XML_URL $TMP_BUILD - - Debug "fetch $BUILD_XML_URL to $TMP_BUILD" - - TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" - Xpath_get $TARGET_XPATH $TMP_BUILD - TARGET_PATH=$XPATH_RESULT - TARGET_URL=$PKG_URL/$TARGET_PATH - - REPOMD_URL=$TARGET_URL/repodata/repomd.xml - PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' - - Fetch $REPOMD_URL $TMP_REPOMD - - Debug "fetch $REPOMD_URL to $TMP_REPOMD" - - Xpath_get $PRIMARY_XPATH $TMP_REPOMD - PRIMARY_XML_PATH=$XPATH_RESULT - PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH - - Fetch $PRIMARY_URL $TMP_PRIMARYGZ - - Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" - - gunzip $TMP_PRIMARYGZ - - Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" -} - -fetch_tizen_pkgs() -{ - ARCH=$1 - PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' - - PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' - - for pkg in ${@:2} - do - Inform "Fetching... $pkg" - XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - PKG_PATH=$XPATH_RESULT - - XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - CHECKSUM=$XPATH_RESULT - - PKG_URL=$TARGET_URL/$PKG_PATH - PKG_FILE=$(basename $PKG_PATH) - PKG_PATH=$TMPDIR/$PKG_FILE - - Debug "Download $PKG_URL to $PKG_PATH" - Fetch $PKG_URL $PKG_PATH true - - echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null - if [ $? -ne 0 ]; then - Error "Fail to fetch $PKG_URL to $PKG_PATH" - Debug "Checksum = $CHECKSUM" - exit 1 - fi - done -} - -Inform "Initialize armel base" -fetch_tizen_pkgs_init standard Tizen-Base -Inform "fetch common packages" -fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils -Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel - -Inform "Initialize standard unified" -fetch_tizen_pkgs_init standard Tizen-Unified -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release - diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index eddb4c380..b04d3b380 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -501,7 +501,7 @@ elif [[ -n "$__CodeName" ]]; then popd fi elif [[ "$__Tizen" == "tizen" ]]; then - ROOTFS_DIR="$__RootfsDir" "$__CrossDir/$__BuildArch/tizen-build-rootfs.sh" + ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch" else echo "Unsupported target platform." usage; diff --git a/eng/common/cross/arm64/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh similarity index 55% rename from eng/common/cross/arm64/tizen-build-rootfs.sh rename to eng/common/cross/tizen-build-rootfs.sh index 13bfddb5e..ac84173d4 100644 --- a/eng/common/cross/arm64/tizen-build-rootfs.sh +++ b/eng/common/cross/tizen-build-rootfs.sh @@ -1,8 +1,34 @@ #!/usr/bin/env bash set -e +ARCH=$1 +LINK_ARCH=$ARCH + +case "$ARCH" in + arm) + TIZEN_ARCH="armv7hl" + ;; + armel) + TIZEN_ARCH="armv7l" + LINK_ARCH="arm" + ;; + arm64) + TIZEN_ARCH="aarch64" + ;; + x86) + TIZEN_ARCH="i686" + ;; + x64) + TIZEN_ARCH="x86_64" + LINK_ARCH="x86" + ;; + *) + echo "Unsupported architecture for tizen: $ARCH" + exit 1 +esac + __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__TIZEN_CROSSDIR="$__CrossDir/tizen" +__TIZEN_CROSSDIR="$__CrossDir/${ARCH}/tizen" if [[ -z "$ROOTFS_DIR" ]]; then echo "ROOTFS_DIR is not defined." @@ -14,7 +40,7 @@ mkdir -p $TIZEN_TMP_DIR # Download files echo ">>Start downloading files" -VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR +VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR $TIZEN_ARCH echo "<>Start constructing Tizen rootfs" @@ -30,6 +56,6 @@ rm -rf $TIZEN_TMP_DIR # Configure Tizen rootfs echo ">>Start configuring Tizen rootfs" -ln -sfn asm-arm64 ./usr/include/asm +ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch echo "</dev/null; then + VERBOSE=0 +fi + +Log() +{ + if [ $VERBOSE -ge $1 ]; then + echo ${@:2} + fi +} + +Inform() +{ + Log 1 -e "\x1B[0;34m$@\x1B[m" +} + +Debug() +{ + Log 2 -e "\x1B[0;32m$@\x1B[m" +} + +Error() +{ + >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" +} + +Fetch() +{ + URL=$1 + FILE=$2 + PROGRESS=$3 + if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then + CURL_OPT="--progress-bar" + else + CURL_OPT="--silent" + fi + curl $CURL_OPT $URL > $FILE +} + +hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } +hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } +hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } + +TMPDIR=$1 +if [ ! -d $TMPDIR ]; then + TMPDIR=./tizen_tmp + Debug "Create temporary directory : $TMPDIR" + mkdir -p $TMPDIR +fi + +TIZEN_ARCH=$2 + +TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen +BUILD_XML=build.xml +REPOMD_XML=repomd.xml +PRIMARY_XML=primary.xml +TARGET_URL="http://__not_initialized" + +Xpath_get() +{ + XPATH_RESULT='' + XPATH=$1 + XML_FILE=$2 + RESULT=$(xmllint --xpath $XPATH $XML_FILE) + if [[ -z ${RESULT// } ]]; then + Error "Can not find target from $XML_FILE" + Debug "Xpath = $XPATH" + exit 1 + fi + XPATH_RESULT=$RESULT +} + +fetch_tizen_pkgs_init() +{ + TARGET=$1 + PROFILE=$2 + Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" + + TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs + if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi + mkdir -p $TMP_PKG_DIR + + PKG_URL=$TIZEN_URL/$PROFILE/latest + + BUILD_XML_URL=$PKG_URL/$BUILD_XML + TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML + TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML + TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML + TMP_PRIMARYGZ=${TMP_PRIMARY}.gz + + Fetch $BUILD_XML_URL $TMP_BUILD + + Debug "fetch $BUILD_XML_URL to $TMP_BUILD" + + TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" + Xpath_get $TARGET_XPATH $TMP_BUILD + TARGET_PATH=$XPATH_RESULT + TARGET_URL=$PKG_URL/$TARGET_PATH + + REPOMD_URL=$TARGET_URL/repodata/repomd.xml + PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' + + Fetch $REPOMD_URL $TMP_REPOMD + + Debug "fetch $REPOMD_URL to $TMP_REPOMD" + + Xpath_get $PRIMARY_XPATH $TMP_REPOMD + PRIMARY_XML_PATH=$XPATH_RESULT + PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH + + Fetch $PRIMARY_URL $TMP_PRIMARYGZ + + Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" + + gunzip $TMP_PRIMARYGZ + + Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" +} + +fetch_tizen_pkgs() +{ + ARCH=$1 + PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' + + PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' + + for pkg in ${@:2} + do + Inform "Fetching... $pkg" + XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + PKG_PATH=$XPATH_RESULT + + XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + CHECKSUM=$XPATH_RESULT + + PKG_URL=$TARGET_URL/$PKG_PATH + PKG_FILE=$(basename $PKG_PATH) + PKG_PATH=$TMPDIR/$PKG_FILE + + Debug "Download $PKG_URL to $PKG_PATH" + Fetch $PKG_URL $PKG_PATH true + + echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null + if [ $? -ne 0 ]; then + Error "Fail to fetch $PKG_URL to $PKG_PATH" + Debug "Checksum = $CHECKSUM" + exit 1 + fi + done +} + +Inform "Initialize ${TIZEN_ARCH} base" +fetch_tizen_pkgs_init standard Tizen-Base +Inform "fetch common packages" +fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils +Inform "fetch coreclr packages" +fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +Inform "fetch corefx packages" +fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel + +Inform "Initialize standard unified" +fetch_tizen_pkgs_init standard Tizen-Unified +Inform "fetch corefx packages" +fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release + diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 964610524..ccfb9951a 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -120,6 +120,10 @@ if(TIZEN) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) endif() + if(TARGET_ARCH_NAME STREQUAL "x64") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) + endif() endif() if(ANDROID) @@ -248,7 +252,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() -elseif(TARGET_ARCH_NAME STREQUAL "arm64") +elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") diff --git a/global.json b/global.json index 558fda0ef..07866ffa0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22606.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22606.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22612.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22612.4" } } From 32af9d9aefe6a484c89b9b643e39a96694f323bb Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Mon, 28 Nov 2022 16:16:31 +0100 Subject: [PATCH 213/249] disabled workarounds for console/classlib templates --- test/EndToEnd/ProjectBuildTests.cs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 0678fb440..fee431cbb 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -15,8 +15,6 @@ namespace EndToEnd.Tests { public class ProjectBuildTests : TestBase { - private static readonly string currentTfm = "net8.0"; - [Fact] public void ItCanNewRestoreBuildRunCleanMSBuildProject() { @@ -29,13 +27,6 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string projectPath = Path.Combine(projectDirectory, directory.Name + ".csproj"); - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework").Value = currentTfm; - project.Save(projectPath); - new RestoreCommand() .WithWorkingDirectory(projectDirectory) .Execute() @@ -80,9 +71,6 @@ namespace EndToEnd.Tests var ns = project.Root.Name.Namespace; project.Root.Attribute("Sdk").Value = "Microsoft.NET.Sdk.Web"; - project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework").Value = currentTfm; - project.Save(projectPath); new BuildCommand() @@ -397,8 +385,6 @@ namespace EndToEnd.Tests // Return net7.0 for templates that don't support // net8.0 yet. if (template.StartsWith("blazor") - || template.StartsWith("classlib") - || template.StartsWith("console") || template.StartsWith("mvc") || template.StartsWith("web") || template.StartsWith("worker") From 964d83d0f811842e3ef1b06cf7c86ff7707f460b Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Mon, 28 Nov 2022 16:20:21 +0100 Subject: [PATCH 214/249] removed duplicate args for `dotnet new` --- test/EndToEnd/ProjectBuildTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index fee431cbb..db62000b3 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -21,7 +21,7 @@ namespace EndToEnd.Tests var directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; - string newArgs = "console --debug:ephemeral-hive --no-restore"; + string newArgs = "console --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) @@ -59,7 +59,7 @@ namespace EndToEnd.Tests var directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; - string newArgs = "console --debug:ephemeral-hive --no-restore"; + string newArgs = "console --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) @@ -224,7 +224,7 @@ namespace EndToEnd.Tests DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: templateName); string projectDirectory = directory.FullName; - string newArgs = $"{templateName} --debug:ephemeral-hive"; + string newArgs = $"{templateName}"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) @@ -406,7 +406,7 @@ namespace EndToEnd.Tests DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); string projectDirectory = directory.FullName; - string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore"; + string newArgs = $"{templateName} --no-restore"; if (!string.IsNullOrWhiteSpace(language)) { newArgs += $" --language {language}"; From 35bf9b14230834502a459ec077f4abce86efad6c Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Mon, 12 Dec 2022 18:00:09 +0100 Subject: [PATCH 215/249] removed workaround in BundledTemplates.targets --- src/redist/targets/BundledTemplates.targets | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 3646546f8..a66265ed3 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -22,6 +22,7 @@ + @@ -30,10 +31,6 @@ - - - - From e9e0a769c7d294e0fd16db95cadbf80d11c7f4c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 18:00:50 +0000 Subject: [PATCH 216/249] [main] Update dependencies from dotnet/sdk (#15118) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221209-01 to 17.5.0-preview-20221209-03 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22609.1 to 8.0.100-1.22612.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22608-02 to 17.5.0-preview-22612-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.5.0-preview.2.108 to 6.5.0-preview.3.126 (parent: Microsoft.NET.Sdk) - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-f64e2f71-8a38-4252-ad60-74b7e6f08ef1 - Resolve source-build patch conflicts - --amend - --amend --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- ...solvePackageFileConflicts-workaround.patch | 23 ------ .../0003-Address-obsolete-errors.patch | 24 ------ ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 --------- ...-version-properties-for-source-build.patch | 47 ------------ ...geVersion-props-to-address-prebuilts.patch | 34 +++++++++ 7 files changed, 87 insertions(+), 183 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f7152688..ef58fd01b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 @@ -137,14 +137,14 @@ ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - 8da5d535932a4143bbd8594c8a66cca686db9bfc + bedc83105652ba5638dfc1ec629f3402af65acd0 - + https://github.com/dotnet/linker - 27ce03227f4822aaff660ec9bac6fe6c20d001d2 + dde6d62e9e80cde5e2dd8a2ce613384ff41d4a08 linker @@ -153,14 +153,14 @@ 716366a3830293571eaaad9b1b2b3929b5216f42 - + https://github.com/dotnet/msbuild - c81f58b45b97d3d0e547f48719322d55f00b5aa4 + 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 - + https://github.com/nuget/nuget.client - be87c9ee11149780ce7de5fe35fe2653d565ccfd + 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 diff --git a/eng/Versions.props b/eng/Versions.props index ffdc48d6f..aa3ffbe10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 0.2.0 - 8.0.100-alpha.1.22610.2 - 8.0.100-alpha.1.22610.2 - 8.0.100-alpha.1.22610.2 + 8.0.100-alpha.1.22612.6 + 8.0.100-alpha.1.22612.6 + 8.0.100-alpha.1.22612.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221209-01 + 17.5.0-preview-20221209-03 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch deleted file mode 100644 index b98759d70..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 27 Oct 2022 02:47:08 +0000 -Subject: [PATCH] Address obsolete errors - -Backport: https://github.com/dotnet/aspnetcore/pull/44734 ---- - src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -index f31880e891..fc6322dd41 100644 ---- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -@@ -252,9 +252,6 @@ public class KestrelServerOptions - writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); - writer.WriteBooleanValue(AllowResponseHeaderCompression); - -- writer.WritePropertyName(nameof(EnableAltSvc)); -- writer.WriteBooleanValue(EnableAltSvc); -- - writer.WritePropertyName(nameof(IsDevCertLoaded)); - writer.WriteBooleanValue(IsDevCertLoaded); - diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch deleted file mode 100644 index e8b8f38fd..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 15 Nov 2022 17:34:00 +0000 -Subject: [PATCH] Address Microsoft.Build.Locator prebuilt - -Backport: https://github.com/dotnet/format/issues/1759 ---- - Directory.Packages.props | 2 +- - eng/Versions.props | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c4bf3cf..f7e85b2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index fcd583b..2933963 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -14,6 +14,7 @@ - - - 17.3.0-preview-22302-02 -+ 1.5.5 - 3.3.3 - 7.0.0-rc.1.22426.10 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch deleted file mode 100644 index 76a1abde5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 21 Nov 2022 22:32:04 +0000 -Subject: [PATCH] Add package version properties for source-build - -Backport: https://github.com/NuGet/Home/issues/12261 ---- - Directory.Packages.props | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8afa7dd31..0c4eaecf5 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -9,11 +9,13 @@ - 17.2.0-preview-2-32304-091 - 16.153.0 - -- 17.3.1 -+ 17.3.1 - - 16.8.0 - - 16.11.0 -+ 3.0.0 -+ 4.5.0 - - - -@@ -56,7 +58,7 @@ - - - -- -+ - - - -@@ -66,7 +68,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch new file mode 100644 index 000000000..938dcbf9d --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 12 Dec 2022 19:30:59 +0000 +Subject: [PATCH] Define PackageVersion props to address prebuilts + +Backport: https://github.com/NuGet/Home/issues/12317 +--- + Directory.Packages.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index e4b41a45f..245ffcc99 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -16,6 +16,8 @@ + 16.11.0 + + ++ 6.0.0 ++ 6.0.0 + 3.0.0 + 4.5.0 + +@@ -38,8 +40,8 @@ + + + +- +- ++ ++ + + + From 0b957759164e77456efb39e778cf0df0dafc741d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 18:46:50 +0000 Subject: [PATCH 217/249] Update dependencies from https://github.com/dotnet/emsdk build 20221212.1 (#15123) [main] Update dependencies from dotnet/emsdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef58fd01b..fc9380e89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 16e4d145b2c911c42c2668782dfc42e4500a425d + 9d8545dee0b3b8ae7dcc357fc5c0598487e8df1d - + https://github.com/dotnet/emsdk - 16e4d145b2c911c42c2668782dfc42e4500a425d + 9d8545dee0b3b8ae7dcc357fc5c0598487e8df1d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index aa3ffbe10..c10156c90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -222,8 +222,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22605.2 - 8.0.0-alpha.1.22605.2 + 8.0.0-alpha.1.22612.1 + 8.0.0-alpha.1.22612.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From bccc46bfad79abe82f742c15c6bc18eaeef49fa2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 00:46:50 +0000 Subject: [PATCH 218/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221213.1 (#15125) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc9380e89..4dae85344 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 847c458e64fdc51b6445eadce74a7998ce4bbbfb + 760f56f2f133a4ea8dab49803bed910a90d72fdf From a3093b4d35a5ce2eba29abd734f085e36a8b919b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 14 Dec 2022 10:59:05 -0600 Subject: [PATCH 219/249] Cleanup top level source-build directories (#15126) * Rename repos dir to repo-projects * Move keys dir into prereqs * Refactor Tools and tools-local dirs * Refactor ArcadeOverrides dir * Update .gitignore --- src/SourceBuild/tarball/content/.gitignore | 8 ++++--- .../tarball/content/Directory.Build.props | 16 ++++++-------- src/SourceBuild/tarball/content/build.proj | 12 +++++------ src/SourceBuild/tarball/content/build.sh | 2 +- .../arcade-overrides}/AfterSourceBuild.proj | 0 .../SourceBuildArcadeBuild.targets | 0 .../SourceBuildArcadeTools.targets | 0 .../tools}/Directory.Build.props | 0 .../tools}/EmptySdk/Sdk/Sdk.props | 0 .../tools}/EmptySdk/Sdk/Sdk.targets | 0 .../generate-graphviz/generate-graphviz.proj | 6 +++--- .../tools}/init-build.proj | 2 +- .../tools}/tasks/Directory.Build.props | 0 .../CatalogFileEntry.cs | 0 .../CatalogPackageEntry.cs | 0 .../CheckForPoison.cs | 0 .../MarkAndCatalogPackages.cs | 0 ...Net.SourceBuild.Tasks.LeakDetection.csproj | 0 .../NuGet.Config | 0 .../PoisonMatch.cs | 0 .../PoisonType.cs | 0 .../PoisonedFileEntry.cs | 0 .../Utility.cs | 0 .../_._ | 0 .../AddRidToRuntimeJson.cs | 0 .../AddSourceToNuGetConfig.cs | 0 .../AzureConnectionStringBuildTask.cs | 0 .../AzureHelper.cs | 0 .../BuildTask.cs | 0 .../DownloadFileSB.cs | 0 .../EnumerableExtensions.cs | 0 .../FileUtilities.cs | 0 .../FixPathSeparator.cs | 0 .../Log.cs | 0 ...soft.DotNet.SourceBuild.Tasks.XPlat.csproj | 0 .../Models/VersionDetailsXml.cs | 0 .../NuGetPack.cs | 0 .../NuspecPropertyStringProvider.cs | 0 .../PackagingTask.cs | 0 .../ReadNuGetPackageInfos.cs | 0 .../RemoveInternetSourcesFromNuGetConfig.cs | 0 .../ReplaceFeedsInNuGetConfig.cs | 0 .../ReplaceRegexInFiles.cs | 0 .../ReplaceTextInFile.cs | 0 .../ReplaceTextInFiles.cs | 0 .../RepoTasks/JoinItems.cs | 0 .../UpdateJson.cs | 0 ...UpdateNuGetConfigPackageSourcesMappings.cs | 0 .../UploadClient.cs | 0 .../UploadToAzure.cs | 0 .../UsageReport/AnnotatedUsage.cs | 0 .../UsageReport/Usage.cs | 0 .../UsageReport/UsageData.cs | 0 .../ValidateUsageAgainstBaseline.cs | 0 .../UsageReport/WritePackageUsageData.cs | 0 .../UsageReport/WriteUsageBurndownData.cs | 0 .../UsageReport/WriteUsageReports.cs | 0 .../UsageReport/XmlParsingHelpers.cs | 0 .../WriteBuildOutputProps.cs | 0 .../WriteRestoreSourceAndVersionProps.cs | 0 .../WriteRestoreSourceProps.cs | 0 .../WriteVersionsFile.cs | 0 .../ZipFileExtractToDirectory.cs | 0 .../_._ | 0 .../SourceBuild.MSBuildSdkResolver.csproj | 0 .../SourceBuiltSdkResolver.cs | 0 .../{ => prereqs}/keys/Newtonsoft.Json.snk | Bin .../{ => prereqs}/keys/NuGet.Client.snk | Bin .../content/{ => prereqs}/keys/README.md | 0 .../Directory.Build.props | 4 ++-- .../Directory.Build.targets | 20 +++++++++--------- .../{repos => repo-projects}/arcade.proj | 0 .../{repos => repo-projects}/aspnetcore.proj | 0 .../command-line-api.proj | 0 .../deployment-tools.proj | 0 .../{repos => repo-projects}/diagnostics.proj | 0 .../{repos => repo-projects}/format.proj | 0 .../{repos => repo-projects}/fsharp.proj | 2 +- .../{repos => repo-projects}/installer.proj | 0 .../known-good-tests.proj | 0 .../{repos => repo-projects}/known-good.proj | 0 .../{repos => repo-projects}/linker.proj | 0 .../{repos => repo-projects}/msbuild.proj | 2 +- .../nuget-client.proj | 0 .../package-source-build.proj | 0 .../{repos => repo-projects}/razor.proj | 0 .../roslyn-analyzers.proj | 0 .../{repos => repo-projects}/roslyn.proj | 0 .../{repos => repo-projects}/runtime.proj | 0 .../content/{repos => repo-projects}/sdk.proj | 0 .../source-build-externals.proj | 0 .../source-build-reference-packages.proj | 0 .../{repos => repo-projects}/sourcelink.proj | 0 .../{repos => repo-projects}/symreader.proj | 0 .../{repos => repo-projects}/templating.proj | 0 .../test-templates.proj | 0 .../{repos => repo-projects}/vstest.proj | 0 .../content/{repos => repo-projects}/xdt.proj | 0 .../{repos => repo-projects}/xliff-tasks.proj | 0 99 files changed, 37 insertions(+), 37 deletions(-) rename src/SourceBuild/tarball/content/{ArcadeOverrides => eng/arcade-overrides}/AfterSourceBuild.proj (100%) rename src/SourceBuild/tarball/content/{ArcadeOverrides => eng/arcade-overrides}/SourceBuildArcadeBuild.targets (100%) rename src/SourceBuild/tarball/content/{ArcadeOverrides => eng/arcade-overrides}/SourceBuildArcadeTools.targets (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/Directory.Build.props (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/EmptySdk/Sdk/Sdk.props (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/EmptySdk/Sdk/Sdk.targets (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/generate-graphviz/generate-graphviz.proj (89%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/init-build.proj (99%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Directory.Build.props (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj (100%) rename src/SourceBuild/tarball/content/{tools-local => eng/tools}/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs (100%) rename src/SourceBuild/tarball/content/{ => prereqs}/keys/Newtonsoft.Json.snk (100%) rename src/SourceBuild/tarball/content/{ => prereqs}/keys/NuGet.Client.snk (100%) rename src/SourceBuild/tarball/content/{ => prereqs}/keys/README.md (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/Directory.Build.props (97%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/Directory.Build.targets (98%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/arcade.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/aspnetcore.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/command-line-api.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/deployment-tools.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/diagnostics.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/format.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/fsharp.proj (93%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/installer.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/known-good-tests.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/known-good.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/linker.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/msbuild.proj (96%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/nuget-client.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/package-source-build.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/razor.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/roslyn-analyzers.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/roslyn.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/runtime.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/sdk.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/source-build-externals.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/source-build-reference-packages.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/sourcelink.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/symreader.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/templating.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/test-templates.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/vstest.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/xdt.proj (100%) rename src/SourceBuild/tarball/content/{repos => repo-projects}/xliff-tasks.proj (100%) diff --git a/src/SourceBuild/tarball/content/.gitignore b/src/SourceBuild/tarball/content/.gitignore index 3d0d3589c..6694e6a2d 100644 --- a/src/SourceBuild/tarball/content/.gitignore +++ b/src/SourceBuild/tarball/content/.gitignore @@ -1,8 +1,10 @@ /.dotnet -/Tools /artifacts /packages -/tools-local/**/bin -/tools-local/**/obj +/eng/tools/**/bin +/eng/tools/**/obj /src/linker/src/ILLink.Tasks/ILLink.Tasks.nuspec /src/nuget-client/NuGet.config +/test/Microsoft.DotNet.SourceBuild.SmokeTests/bin +/test/Microsoft.DotNet.SourceBuild.SmokeTests/obj +/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 5229c0ebb..1de78e8f8 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -33,7 +33,7 @@ $(MSBuildThisFileDirectory) $(ProjectDir)targets/ - $(ProjectDir)keys/ + $(ProjectDir)prereqs/keys/ $([MSBuild]::EnsureTrailingSlash('$(CustomDotNetSdkDir)')) $([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)')) $(ProjectDir).dotnet/ @@ -83,12 +83,12 @@ + $(RepositoryEngineeringDir)arcade-overrides/ $(ArtifactsDir) $(ProjectDir).git/modules/src/ - $(ProjectDir)Tools/ - $(ToolsDir)source-built/ - $(ProjectDir)tools-local/ - $(ToolsLocalDir)tasks/ + $(ArtifactsDir)source-built-sdks/ + $(RepositoryEngineeringDir)/tools/ + $(ToolsDir)tasks/ $(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/$(Configuration)/ $(XPlatTasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll @@ -129,6 +129,7 @@ $(GitInfoOfflineDir)$(RepositoryName).props $(GitInfoOfflineDir)AllRepoVersions.props $(BaseOutputPath)prebuilt-report/ + $(ProjectDir)/repo-projects/ $(PackageReportDir)prebuilt-packages/ $(PackageReportDir)prebuilt-usage.xml $(PackageReportDir)poison-usage.xml @@ -148,15 +149,12 @@ https://dotnetcli.azureedge.net/source-built-artifacts/assets/ archiveArtifacts.txt $(ExternalTarballsDir)$(ArchiveArtifactsTextFileName) - $(ToolsLocalDir)prebuilt-baseline.xml + $(ToolsDir)prebuilt-baseline.xml $(ProjectDir)test/exclusions/ $(ProjectDir)test/Microsoft.DotNet.SourceBuild.SmokeTests/ - - - ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/arm ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 731e5665e..cbad41cc9 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -11,14 +11,14 @@ - + - - + + @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + - + + $(ProjectDir)repo-projects\known-good.proj; + $(ProjectDir)repo-projects\known-good-tests.proj" /> - + - + @@ -156,6 +156,6 @@ - + diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets similarity index 98% rename from src/SourceBuild/tarball/content/repos/Directory.Build.targets rename to src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets index b7f1dfa9c..e663f8937 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets @@ -503,7 +503,7 @@ + Subsequent projects will get Arcade from eng/source-built-sdks. --> @@ -593,28 +593,28 @@ - + - + + WorkingDirectory="$(SourceBuiltSdksDir)%(_ToolPackage.Id)/tools/SourceBuild/" /> - $(ToolPackageExtractDir)%(_ToolPackage.Id)/ + $(SourceBuiltSdksDir)%(_ToolPackage.Id)/ - + - + @@ -714,7 +714,7 @@ - + @@ -761,7 +761,7 @@ - + diff --git a/src/SourceBuild/tarball/content/repos/arcade.proj b/src/SourceBuild/tarball/content/repo-projects/arcade.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/arcade.proj rename to src/SourceBuild/tarball/content/repo-projects/arcade.proj diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/aspnetcore.proj rename to src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj diff --git a/src/SourceBuild/tarball/content/repos/command-line-api.proj b/src/SourceBuild/tarball/content/repo-projects/command-line-api.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/command-line-api.proj rename to src/SourceBuild/tarball/content/repo-projects/command-line-api.proj diff --git a/src/SourceBuild/tarball/content/repos/deployment-tools.proj b/src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/deployment-tools.proj rename to src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj diff --git a/src/SourceBuild/tarball/content/repos/diagnostics.proj b/src/SourceBuild/tarball/content/repo-projects/diagnostics.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/diagnostics.proj rename to src/SourceBuild/tarball/content/repo-projects/diagnostics.proj diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repo-projects/format.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/format.proj rename to src/SourceBuild/tarball/content/repo-projects/format.proj diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repo-projects/fsharp.proj similarity index 93% rename from src/SourceBuild/tarball/content/repos/fsharp.proj rename to src/SourceBuild/tarball/content/repo-projects/fsharp.proj index 3ffd14406..36261805f 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repo-projects/fsharp.proj @@ -33,7 +33,7 @@ - + diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repo-projects/installer.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/installer.proj rename to src/SourceBuild/tarball/content/repo-projects/installer.proj diff --git a/src/SourceBuild/tarball/content/repos/known-good-tests.proj b/src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/known-good-tests.proj rename to src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repo-projects/known-good.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/known-good.proj rename to src/SourceBuild/tarball/content/repo-projects/known-good.proj diff --git a/src/SourceBuild/tarball/content/repos/linker.proj b/src/SourceBuild/tarball/content/repo-projects/linker.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/linker.proj rename to src/SourceBuild/tarball/content/repo-projects/linker.proj diff --git a/src/SourceBuild/tarball/content/repos/msbuild.proj b/src/SourceBuild/tarball/content/repo-projects/msbuild.proj similarity index 96% rename from src/SourceBuild/tarball/content/repos/msbuild.proj rename to src/SourceBuild/tarball/content/repo-projects/msbuild.proj index 4069d7d3d..0504e9702 100644 --- a/src/SourceBuild/tarball/content/repos/msbuild.proj +++ b/src/SourceBuild/tarball/content/repo-projects/msbuild.proj @@ -57,7 +57,7 @@ - $(ToolPackageExtractDir)%(_CentralVersionsToolPackage.Id)/ + $(SourceBuiltSdksDir)%(_CentralVersionsToolPackage.Id)/ diff --git a/src/SourceBuild/tarball/content/repos/nuget-client.proj b/src/SourceBuild/tarball/content/repo-projects/nuget-client.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/nuget-client.proj rename to src/SourceBuild/tarball/content/repo-projects/nuget-client.proj diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repo-projects/package-source-build.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/package-source-build.proj rename to src/SourceBuild/tarball/content/repo-projects/package-source-build.proj diff --git a/src/SourceBuild/tarball/content/repos/razor.proj b/src/SourceBuild/tarball/content/repo-projects/razor.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/razor.proj rename to src/SourceBuild/tarball/content/repo-projects/razor.proj diff --git a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj b/src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj rename to src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repo-projects/roslyn.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/roslyn.proj rename to src/SourceBuild/tarball/content/repo-projects/roslyn.proj diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repo-projects/runtime.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/runtime.proj rename to src/SourceBuild/tarball/content/repo-projects/runtime.proj diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repo-projects/sdk.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/sdk.proj rename to src/SourceBuild/tarball/content/repo-projects/sdk.proj diff --git a/src/SourceBuild/tarball/content/repos/source-build-externals.proj b/src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/source-build-externals.proj rename to src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj rename to src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj diff --git a/src/SourceBuild/tarball/content/repos/sourcelink.proj b/src/SourceBuild/tarball/content/repo-projects/sourcelink.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/sourcelink.proj rename to src/SourceBuild/tarball/content/repo-projects/sourcelink.proj diff --git a/src/SourceBuild/tarball/content/repos/symreader.proj b/src/SourceBuild/tarball/content/repo-projects/symreader.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/symreader.proj rename to src/SourceBuild/tarball/content/repo-projects/symreader.proj diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repo-projects/templating.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/templating.proj rename to src/SourceBuild/tarball/content/repo-projects/templating.proj diff --git a/src/SourceBuild/tarball/content/repos/test-templates.proj b/src/SourceBuild/tarball/content/repo-projects/test-templates.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/test-templates.proj rename to src/SourceBuild/tarball/content/repo-projects/test-templates.proj diff --git a/src/SourceBuild/tarball/content/repos/vstest.proj b/src/SourceBuild/tarball/content/repo-projects/vstest.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/vstest.proj rename to src/SourceBuild/tarball/content/repo-projects/vstest.proj diff --git a/src/SourceBuild/tarball/content/repos/xdt.proj b/src/SourceBuild/tarball/content/repo-projects/xdt.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/xdt.proj rename to src/SourceBuild/tarball/content/repo-projects/xdt.proj diff --git a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj b/src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/xliff-tasks.proj rename to src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj From 6fc336e78432ad47d0d57edb9808a595e24d910f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Dec 2022 19:01:17 +0000 Subject: [PATCH 220/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221214.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22613.1 -> To Version 8.0.0-alpha.1.22614.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dae85344..8dff5fdc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,7 +217,7 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages 760f56f2f133a4ea8dab49803bed910a90d72fdf From aa8dc8be5b0f754aa9782a5c7fc4a92647cc698b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 21:31:09 +0000 Subject: [PATCH 221/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221213.1 (#15131) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dae85344..6e679891f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - bea048703a1a2a9b5f35b04660b74a63ae2520cd + 1f85bcc9a173361e3901db380f3647be96cc2f5c From 22a0996162b5b16a1a4cfc6070a2efbdb31c83ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Dec 2022 04:33:56 +0000 Subject: [PATCH 222/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221214.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22614.1 -> To Version 8.0.0-alpha.1.22614.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dbaf5cbf..6c4318e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 760f56f2f133a4ea8dab49803bed910a90d72fdf + a1cf9825ff1b8b666bb0da9f92c2df155a467855 From ce1921c17de51cfaba45b488d883a4564a7c353c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 15 Dec 2022 09:33:09 +0100 Subject: [PATCH 223/249] Run VMR's pipelines from the VMR directly (#15124) --- .vsts-ci.yml | 2 +- eng/build.yml | 57 ++++++++++++------- eng/pipelines/templates/jobs/vmr-build.yml | 19 +++---- .../templates/jobs/vmr-synchronization.yml | 10 +--- eng/pipelines/templates/stages/vmr-build.yml | 24 ++++---- eng/pipelines/templates/steps/vmr-prepare.yml | 36 +++++------- eng/pipelines/vmr-ci.yml | 21 ------- .../tarball/content/eng/pipelines/ci.yml | 52 +++++++++++++++++ 8 files changed, 130 insertions(+), 91 deletions(-) delete mode 100644 eng/pipelines/vmr-ci.yml create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/ci.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7e9bc79af..59526b0ca 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -377,7 +377,7 @@ stages: - template: eng/pipelines/templates/stages/vmr-build.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} - installerBuildResourceId: current + isBuiltFromVmr: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/build.yml b/eng/build.yml index 246bf679e..121f81771 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -63,6 +63,11 @@ parameters: type: boolean default: false +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet + type: boolean + default: false + jobs: - template: common/templates/job/job.yml parameters: @@ -96,9 +101,12 @@ jobs: vmImage: 'macOS-latest' timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - enablePublishBuildAssets: true - enablePublishUsingPipelines: true - enableTelemetry: true + ${{ if parameters.isBuiltFromVmr }}: + enableSbom: false + ${{ else }}: + enablePublishBuildAssets: true + enablePublishUsingPipelines: true + enableTelemetry: true helixRepo: dotnet/installer workspace: clean: all @@ -139,29 +147,40 @@ jobs: - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - _PushToVSFeed: true - - _SignType: real + - ${{ if parameters.isBuiltFromVmr }}: + - installerRoot: '$(Build.SourcesDirectory)/src/installer' + - _SignType: test + - _PushToVSFeed: false - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + /p:DotNetPublishUsingPipelines=true + /p:PublishToSymbolServer=false $(_PgoInstrument) + - ${{ else }}: + - installerRoot: '$(Build.SourcesDirectory)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) steps: - checkout: self clean: true - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: PowerShell@2 displayName: Setup Private Feeds Credentials inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(installerRoot)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(installerRoot)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - - script: build.cmd + - script: $(installerRoot)/build.cmd $(_TestArg) $(_PackArg) -publish -ci -sign -Configuration ${{ parameters.buildConfiguration }} @@ -174,16 +193,16 @@ jobs: DOTNET_CLI_UI_LANGUAGE: ${{ parameters.dotnetCLIUILanguage }} - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: Bash@3 displayName: Setup Private Feeds Credentials inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token + filePath: $(installerRoot)/eng/common/SetupNugetSources.sh + arguments: $(installerRoot)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Linux') }}: - - script: ./build.sh + - script: $(installerRoot)/build.sh $(_TestArg) $(_PackArg) --publish --ci --noprettyprint @@ -197,7 +216,7 @@ jobs: displayName: Build - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: - - script: ./build.sh + - script: $(installerRoot)/build.sh $(_TestArg) --pack --publish --ci --noprettyprint @@ -222,7 +241,7 @@ jobs: - task: CopyFiles@2 displayName: Gather Logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' + SourceFolder: '$(installerRoot)/artifacts' Contents: | log/${{ parameters.buildConfiguration }}/**/* TestResults/${{ parameters.buildConfiguration }}/**/* diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index d7337f38e..5c21c1bf5 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -2,6 +2,9 @@ ### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested parameters: +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet directly + type: boolean - name: vmrPath type: string @@ -12,10 +15,6 @@ parameters: type: string default: $(Build.SourceBranchName) -# Resource id of the installer build to retrieve MSFT SDK from -- name: installerBuildResourceId - type: string - - name: buildName type: string @@ -63,7 +62,7 @@ jobs: dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }} variables: - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}: - group: DotNetBot-GitHub - group: AzureDevOps-Artifact-Feeds-Pats - ${{ else }}: @@ -80,11 +79,11 @@ jobs: - template: ../steps/vmr-prepare.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} skipComponentGovernanceDetection: true # Synchronize new content in the VMR during PRs (we expect this to come - - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['Build.Reason'], 'PullRequest')) }}: - template: ../steps/vmr-pull-updates.yml parameters: vmrPath: ${{ parameters.vmrPath }} @@ -104,7 +103,7 @@ jobs: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - - download: ${{ parameters.installerBuildResourceId }} + - download: current artifact: BlobArtifacts patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT SDK @@ -167,8 +166,8 @@ jobs: poisonArg='' if [[ '${{ parameters.excludeSdkContentTests }}' != 'True' ]]; then - dockerVolumeArgs+=" -v $(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerVolumeArgs+=" -v $(Pipeline.Workspace)/BlobArtifacts/:/BlobArtifacts" + msftSdkTarballName=$(find "$(Pipeline.Workspace)/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 012b804a0..4befbafd9 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -43,6 +43,7 @@ jobs: - template: ../steps/vmr-prepare.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} + isBuiltFromVmr: false - template: ../steps/vmr-pull-updates.yml parameters: @@ -60,14 +61,5 @@ jobs: git branch ${{ parameters.vmrBranch }} git branch --set-upstream-to=dotnet/${{ parameters.vmrBranch }} ${{ parameters.vmrBranch }} || echo 'Branch ${{ parameters.vmrBranch }} not found in remote' git push dotnet ${{ parameters.vmrBranch }} - - # Export the SHA as an artifact to be reused by the official VMR build - sha=`git rev-parse HEAD` - mkdir -p "$(Build.ArtifactStagingDirectory)/VmrRevision" - echo $sha > "$(Build.ArtifactStagingDirectory)/VmrRevision/VmrRevision.txt" displayName: Push changes to dotnet/dotnet workingDirectory: $(vmrPath) - - - publish: $(Build.ArtifactStagingDirectory)/VmrRevision - artifact: VmrRevision - displayName: Publish new SHA diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 4a3db6eaf..8d052af5d 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -2,12 +2,15 @@ ### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested parameters: - # Resource id of the installer build to retrieve source/product tarball's from - installerBuildResourceId: current + dependsOn: [] + condition: always() # Branch of the VMR to use (to push to for internal builds) vmrBranch: $(Build.SourceBranchName) + # True when build is running from dotnet/dotnet directly + isBuiltFromVmr: + # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 @@ -34,7 +37,8 @@ parameters: stages: - stage: VMR_Source_Build displayName: VMR Source-Build - dependsOn: [] + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} variables: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: defaultPoolName @@ -57,7 +61,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: CentOSStream8_Online - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: @@ -74,7 +78,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: CentOSStream8_Offline - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: @@ -90,7 +94,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: CentOSStream9_Offline - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: @@ -106,7 +110,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: Fedora36_Offline - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: @@ -122,7 +126,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: Ubuntu2004_Offline - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: @@ -138,7 +142,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: Debian11_Offline - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -152,7 +156,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: buildName: Fedora36_Offline_Using_Previous - installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ parameters.vmrBranch }} architecture: x64 pool: diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 2786cbfad..d6aaa13da 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -2,39 +2,33 @@ ### Component Governance scan is also triggered over the VMR's non-repo sources parameters: +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet directly + type: boolean + - name: vmrBranch displayName: dotnet/dotnet branch to use type: string default: $(Build.SourceBranchName) -- name: installerBuildResourceId - displayName: Installer build to get the commit hash to check out from - type: string - default: current - - name: skipComponentGovernanceDetection type: boolean default: false steps: -- checkout: vmr - displayName: Clone dotnet/dotnet - path: vmr - clean: true - fetchDepth: 0 # We need this so that we can check out the new commit +- ${{ if parameters.isBuiltFromVmr }}: + - checkout: self + displayName: Clone dotnet/dotnet + path: vmr + clean: true -- ${{ if ne(parameters.installerBuildResourceId, 'current') }}: - - download: ${{ parameters.installerBuildResourceId }} - artifact: VmrRevision - displayName: Download VmrRevision - - - script: | - set -ex - sha=`head -n 1 $(Pipeline.Workspace)/${{ parameters.installerBuildResourceId }}/VmrRevision/VmrRevision.txt` - git checkout $sha - displayName: Check out dotnet/dotnet commit - workingDirectory: $(Agent.BuildDirectory)/vmr - ${{ else }}: + - checkout: vmr + displayName: Clone dotnet/dotnet + path: vmr + clean: true + +- ${{ if or(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}: - script: | git switch -c ${{ parameters.vmrBranch }} displayName: Checkout ${{ parameters.vmrBranch }} diff --git a/eng/pipelines/vmr-ci.yml b/eng/pipelines/vmr-ci.yml deleted file mode 100644 index a63858e14..000000000 --- a/eng/pipelines/vmr-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: dotnet-installer-official-ci - trigger: - branches: - include: - - main - - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - -stages: -- template: templates/stages/vmr-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/tarball/content/eng/pipelines/ci.yml b/src/SourceBuild/tarball/content/eng/pipelines/ci.yml new file mode 100644 index 000000000..9e74ea872 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/ci.yml @@ -0,0 +1,52 @@ +# This is the main build definition (PR+CI) for dotnet/dotnet + +trigger: + batch: true + branches: + include: + - main + - release/* + - internal/release/* + +pr: + branches: + include: + - main + - release/* + - internal/release/* + +stages: +# For rolling builds we want to build the MSFT SDK first so that we can +# compare the contents with the source-built one later. +# This only works because we don't run this test in PRs. If we decided +# to run this test in PRs, we would need to build the MSFT SDK there too. +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Build_MSFT_SDK + displayName: Build MSFT SDK + jobs: + - template: /src/installer/eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + isBuiltFromVmr: true + - template: /src/installer/eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + isBuiltFromVmr: true + +- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml + parameters: + isBuiltFromVmr: true + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + dependsOn: Build_MSFT_SDK + condition: always() From 46d95433242abbd521e53d69d0b1ff7ef1bfc72c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 10:34:40 +0000 Subject: [PATCH 224/249] Update dependencies from https://github.com/dotnet/arcade-services build 20221214.2 (#15137) [main] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 28fbb2185..ab4e343b3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22606.1", + "version": "1.1.0-beta.22614.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c4318e51..611186207 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade-services - d5675a0eb7702168568d849a3c3453258710aaf5 + 33a418a5d21c1fd1286d0b7bf2c737f89361edd1 - + https://github.com/dotnet/arcade-services - d5675a0eb7702168568d849a3c3453258710aaf5 + 33a418a5d21c1fd1286d0b7bf2c737f89361edd1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c10156c90..084ece458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22606.1 + 1.1.0-beta.22614.2 From c7081c2b5a1e5071bd82e28eea80bf7a94dd6945 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 15 Dec 2022 12:38:34 -0600 Subject: [PATCH 225/249] Move git-info dir into prereqs (#15134) * Move git-info dir into prereqs * Bump DarcLib * Add back import condition for non-repo projects Co-authored-by: Premek Vysoky --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- .../tarball/content/Directory.Build.props | 17 ++++++----------- src/SourceBuild/tarball/content/build.proj | 1 - .../tarball/content/eng/tools/init-build.proj | 2 +- .../content/repo-projects/Directory.Build.props | 3 +-- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ab4e343b3..1bf2fbfd2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22614.2", + "version": "1.1.0-beta.22615.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 611186207..ec422244e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade-services - 33a418a5d21c1fd1286d0b7bf2c737f89361edd1 + 77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8 - + https://github.com/dotnet/arcade-services - 33a418a5d21c1fd1286d0b7bf2c737f89361edd1 + 77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 084ece458..4d13397bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22614.2 + 1.1.0-beta.22615.1 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 1de78e8f8..dc550accf 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -33,7 +33,8 @@ $(MSBuildThisFileDirectory) $(ProjectDir)targets/ - $(ProjectDir)prereqs/keys/ + $(ProjectDir)prereqs/ + $(PrereqsDir)/keys/ $([MSBuild]::EnsureTrailingSlash('$(CustomDotNetSdkDir)')) $([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)')) $(ProjectDir).dotnet/ @@ -120,14 +121,9 @@ $(BaseOutputPath)roslyn-debug/ $(BaseOutputPath)aspnet-debug $(AspNetRazorBuildServerLogDir)razor-build-server.log - - $(BaseOutputPath)git-info/ - - $(ProjectDir)git-info/ - $(GitInfoOutputDir)$(RepositoryName).props - $(GitInfoOutputDir)AllRepoVersions.props - $(GitInfoOfflineDir)$(RepositoryName).props - $(GitInfoOfflineDir)AllRepoVersions.props + $(PrereqsDir)git-info/ + $(GitInfoDir)$(RepositoryName).props + $(GitInfoDir)AllRepoVersions.props $(BaseOutputPath)prebuilt-report/ $(ProjectDir)/repo-projects/ $(PackageReportDir)prebuilt-packages/ @@ -205,8 +201,7 @@ - - + diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index cbad41cc9..c06ee0784 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -24,7 +24,6 @@ - diff --git a/src/SourceBuild/tarball/content/eng/tools/init-build.proj b/src/SourceBuild/tarball/content/eng/tools/init-build.proj index b7b75a86f..1206c1b50 100644 --- a/src/SourceBuild/tarball/content/eng/tools/init-build.proj +++ b/src/SourceBuild/tarball/content/eng/tools/init-build.proj @@ -3,7 +3,7 @@ - + diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props index 76fb89308..dc8d58db5 100644 --- a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props @@ -6,8 +6,7 @@ - - + $(RepositoryName) From a3cd81a9fc2c07acc0e83cd68e89d89e6f1668c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 19:41:09 +0000 Subject: [PATCH 226/249] [main] Update dependencies from dotnet/source-build-externals (#15138) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec422244e..2721869c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 1f85bcc9a173361e3901db380f3647be96cc2f5c + 32b1b9c546e380d3ace53c768b87c129f756433f From 6b37d32420b68a71794ef6007d9f2670799e905f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 15 Dec 2022 16:21:48 -0600 Subject: [PATCH 227/249] Refactor source-build archives infra (#15135) --- eng/Versions.props | 22 ------- .../tarball/content/eng/Versions.props | 17 ++++++ src/SourceBuild/tarball/content/prep.sh | 57 ++++++++++++------- 3 files changed, 52 insertions(+), 44 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4d13397bc..4da73fd1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -190,28 +190,6 @@ 17.5.0-preview-20221209-03 8.0.0-alpha.1.22557.12 - - - - 15.7.179 - 15.7.179 - - 7.0.100 - 7.0.100 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index df7b892f6..a3457effc 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -9,4 +9,21 @@ 2.2.0 + + + + 7.0.100 + diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index c90dab9ac..aaba4f130 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -39,12 +39,6 @@ while :; do shift done -# Check for the archive text file which describes the location of the archive files to download -if [ ! -f $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt ]; then - echo " ERROR: $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt does not exist. Cannot determine which archives to download. Exiting..." - exit -1 -fi - downloadArtifacts=true downloadPrebuilts=true installDotnet=true @@ -57,13 +51,15 @@ then fi # Check if Private.SourceBuilt artifacts archive exists -if [ -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz ]; then +artifactsBaseFileName="Private.SourceBuilt.Artifacts" +if [ -f $SCRIPT_ROOT/packages/archive/$artifactsBaseFileName.*.tar.gz ]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists -if [ -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Prebuilts.*.tar.gz ]; then +prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" +if [ -f $SCRIPT_ROOT/packages/archive/$prebuiltsBaseFileName.*.tar.gz ]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi @@ -74,21 +70,38 @@ if [ -d $SCRIPT_ROOT/.dotnet ]; then installDotnet=false; fi -# Read the archive text file to get the archives to download and download them -while read -r line; do - if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then - if [ "$downloadArtifacts" == "true" ]; then - echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) - fi +function DownloadArchive { + archiveType="$1" + baseFileName="$2" + isRequired="$3" + + sourceBuiltArtifactsTarballUrl="https://dotnetcli.azureedge.net/source-built-artifacts/assets/" + packageVersionsPath="$SCRIPT_ROOT/eng/Versions.props" + notFoundMessage="No source-built $archiveType found to download..." + + echo " Looking for source-built $archiveType to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + if [[ $archiveVersionLine =~ $versionPattern ]]; then + archiveUrl="${sourceBuiltArtifactsTarballUrl}${baseFileName}.${BASH_REMATCH[1]}.tar.gz" + echo " Downloading source-built $archiveType from $archiveUrl..." + (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $archiveUrl) + elif [ "$isRequired" == "true" ]; then + echo " ERROR: $notFoundMessage" + exit -1 + else + echo " $notFoundMessage" fi - if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then - if [ "$downloadPrebuilts" == "true" ]; then - echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) - fi - fi -done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt +} + +# Read the eng/Versions.props to get the archives to download and download them +if [ "$downloadArtifacts" == "true" ]; then + DownloadArchive "Artifacts" $artifactsBaseFileName "true" +fi + +if [ "$downloadPrebuilts" == "true" ]; then + DownloadArchive "Prebuilts" $prebuiltsBaseFileName "false" +fi # Check for the version of dotnet to install if [ "$installDotnet" == "true" ]; then From 82cb3b7800a26ed03c51e2b979b98403a9675541 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 16 Dec 2022 08:09:23 -0500 Subject: [PATCH 228/249] Apply RID override behaviour from runtime to aspnetcore/installer --- .../tarball/content/repo-projects/aspnetcore.proj | 7 ++++++- .../tarball/content/repo-projects/installer.proj | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj b/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj index 8d4047ff8..f20c61b71 100644 --- a/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj @@ -2,6 +2,11 @@ + $(TargetRid) + osx-x64 + freebsd-x64 + win-x64 + $(StandardSourceBuildArgs.Replace('--publish', '')) @@ -9,7 +14,7 @@ $(BuildCommandArgs) --no-build-repo-tasks $(BuildCommandArgs) --no-build-nodejs $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) - $(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid) + $(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(OverrideTargetRid) $(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 diff --git a/src/SourceBuild/tarball/content/repo-projects/installer.proj b/src/SourceBuild/tarball/content/repo-projects/installer.proj index f6a9e6325..6dc870be9 100644 --- a/src/SourceBuild/tarball/content/repo-projects/installer.proj +++ b/src/SourceBuild/tarball/content/repo-projects/installer.proj @@ -8,6 +8,8 @@ $(TargetRid) osx-x64 + freebsd-x64 + win-x64 $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) @@ -15,7 +17,6 @@ $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) --runtime-id $(OverrideTargetRid) - --runtime-id $(TargetRid) $(StandardSourceBuildArgs) $(BuildCommandArgs) $(RuntimeArg) @@ -27,14 +28,13 @@ $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 $(BuildCommandArgs) /p:OSName=$(OSNameOverride) $(BuildCommandArgs) /p:PortableOSName=$(PortableOS) - $(BuildCommandArgs) /p:Rid=$(TargetRid) + $(BuildCommandArgs) /p:Rid=$(OverrideTargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid) + $(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(OverrideTargetRid) - $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true - $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 - $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) + $(BuildCommandArgs) /p:PortableBuild=true + $(BuildCommandArgs) /p:CoreSetupRid=$(OverrideTargetRid) $(BuildCommandArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) From ded4d766623a3e6294c433e92706fb2d3b216198 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Dec 2022 13:48:58 +0000 Subject: [PATCH 229/249] Update dependencies from https://github.com/dotnet/source-build-externals build 20221215.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.22614.2 -> To Version 8.0.0-alpha.1.22615.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2721869c2..f7413312b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 32b1b9c546e380d3ace53c768b87c129f756433f + 0c829ba73b00f015ab35d14f3cc974e79eb79ef0 From 60eee7f5b842bc81c832b387f1887777c79fd848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 16 Dec 2022 16:51:40 +0100 Subject: [PATCH 230/249] Only push `main` and `release/*` branches to the VMR (#15144) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 4befbafd9..364b149bc 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -52,7 +52,8 @@ jobs: targetRef: ${{ parameters.targetRef }} # For official builds, push the changes to the VMR - - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: + # Push only main and release branches + - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), startswith(parameters.vmrBranch, 'refs/heads/release/'), startswith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: - script: | set -x git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' From 8167dbf055841dc3af352f84e42b7d529bbdcbdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:03:13 -0600 Subject: [PATCH 231/249] [main] Update dependencies from dotnet/sdk (#15139) Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 88 +++++++++---------- eng/Versions.props | 30 +++---- ...geVersion-props-to-address-prebuilts.patch | 34 ------- 3 files changed, 59 insertions(+), 93 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2721869c2..bf58b4de8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 93219e89112a3d3203879355463b9d5b9d7ef4ba + c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb - + https://github.com/dotnet/windowsdesktop - 93219e89112a3d3203879355463b9d5b9d7ef4ba + c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb - + https://github.com/dotnet/windowsdesktop - 93219e89112a3d3203879355463b9d5b9d7ef4ba + c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb - + https://github.com/dotnet/windowsdesktop - 93219e89112a3d3203879355463b9d5b9d7ef4ba + c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf - + https://github.com/dotnet/aspnetcore - 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 + 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - dffe3a864e40b271bb20e316a5bc96eb0eac3c55 + 99c01747309cac187b8999f23291555b1607337c - + https://github.com/dotnet/sdk - dffe3a864e40b271bb20e316a5bc96eb0eac3c55 + 99c01747309cac187b8999f23291555b1607337c - + https://github.com/dotnet/sdk - dffe3a864e40b271bb20e316a5bc96eb0eac3c55 + 99c01747309cac187b8999f23291555b1607337c - + https://github.com/dotnet/sdk - dffe3a864e40b271bb20e316a5bc96eb0eac3c55 + 99c01747309cac187b8999f23291555b1607337c @@ -128,39 +128,39 @@ https://github.com/dotnet/wpf ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 - + https://github.com/dotnet/fsharp - ae1718567f2aab20df7ca07368b9f51d1c376a10 + 3130e06ce88bc3d6171f5127cdb9972e776af911 - + https://github.com/dotnet/fsharp - ae1718567f2aab20df7ca07368b9f51d1c376a10 + 3130e06ce88bc3d6171f5127cdb9972e776af911 - + https://github.com/microsoft/vstest - bedc83105652ba5638dfc1ec629f3402af65acd0 + d7b66728d22dd5cdee5fb1e2bc385f9f2cd03171 - + https://github.com/dotnet/linker - dde6d62e9e80cde5e2dd8a2ce613384ff41d4a08 + 2db841fc5f6bc7592b66ffe3bd0e1c888d022f93 linker - + https://github.com/dotnet/roslyn - 716366a3830293571eaaad9b1b2b3929b5216f42 + c80d6495d55ebbd64372755d236d0e5971b2dfc7 - + https://github.com/dotnet/msbuild - 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 + eb5ebc23a99af31731a6b6c403ceda0b44aa9966 - + https://github.com/nuget/nuget.client - 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 + 0e7accb78d0df80cda1bffbcf1d522945e8a1112 diff --git a/eng/Versions.props b/eng/Versions.props index 4da73fd1d..b23660bfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 - 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.22615.1 0.2.0 - 8.0.100-alpha.1.22612.6 - 8.0.100-alpha.1.22612.6 - 8.0.100-alpha.1.22612.6 + 8.0.100-alpha.1.22615.13 + 8.0.100-alpha.1.22615.13 + 8.0.100-alpha.1.22615.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-alpha.1.22609.1 - 8.0.0-alpha.1.22609.1 - 8.0.0-alpha.1.22609.1 - 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22614.1 + 8.0.0-alpha.1.22614.1 + 8.0.0-alpha.1.22614.1 + 8.0.0-alpha.1.22614.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221209-03 + 17.5.0-preview-20221214-01 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch deleted file mode 100644 index 938dcbf9d..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 12 Dec 2022 19:30:59 +0000 -Subject: [PATCH] Define PackageVersion props to address prebuilts - -Backport: https://github.com/NuGet/Home/issues/12317 ---- - Directory.Packages.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index e4b41a45f..245ffcc99 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -16,6 +16,8 @@ - 16.11.0 - - -+ 6.0.0 -+ 6.0.0 - 3.0.0 - 4.5.0 - -@@ -38,8 +40,8 @@ - - - -- -- -+ -+ - - - From 88fc74fe81d8c5ab5f6abe29d12c9685f3593e60 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Dec 2022 11:27:13 -0600 Subject: [PATCH 232/249] Replace razor-compiler with razor (#15105) --- .../content/repo-projects/known-good.proj | 3 +- .../tarball/content/repo-projects/sdk.proj | 3 +- ...uild-by-default-and-opt-in-instead-8.patch | 183 ++++++++++++++++++ 3 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch diff --git a/src/SourceBuild/tarball/content/repo-projects/known-good.proj b/src/SourceBuild/tarball/content/repo-projects/known-good.proj index e92b6403a..989d6e20d 100644 --- a/src/SourceBuild/tarball/content/repo-projects/known-good.proj +++ b/src/SourceBuild/tarball/content/repo-projects/known-good.proj @@ -34,8 +34,7 @@ - - + diff --git a/src/SourceBuild/tarball/content/repo-projects/sdk.proj b/src/SourceBuild/tarball/content/repo-projects/sdk.proj index 0abd6d144..5d0fe449d 100644 --- a/src/SourceBuild/tarball/content/repo-projects/sdk.proj +++ b/src/SourceBuild/tarball/content/repo-projects/sdk.proj @@ -39,8 +39,7 @@ - - + diff --git a/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch b/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch new file mode 100644 index 000000000..0fa4e2be0 --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch @@ -0,0 +1,183 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Sienkiewicz +Date: Wed, 14 Dec 2022 21:05:57 -0800 +Subject: [PATCH] Disable source build by default, and opt in instead (#8019) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Add sln filter for source build + +* Use ExcludeSourceBuild instead + +* Put the correct default in 🤦‍♂️ + +* Don't include npm targets when all targets are suppressed + +* Don't override arcade for test projects when building from source + +* Use default source build jobs now we don't need node + +Backport: https://github.com/dotnet/razor/pull/8019 +--- + Directory.Build.props | 3 +++ + Directory.Build.targets | 2 +- + azure-pipelines.yml | 27 +------------------ + ...soft.NET.Sdk.Razor.SourceGenerators.csproj | 1 + + ...c.Razor.Extensions.Tooling.Internal.csproj | 3 ++- + ...CodeAnalysis.Razor.Tooling.Internal.csproj | 3 ++- + .../Directory.Build.props | 3 ++- + ...ft.AspNetCore.Razor.LanguageSupport.csproj | 1 + + 8 files changed, 13 insertions(+), 30 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index efc5ca9ab..9a8caccfb 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -37,6 +37,9 @@ + + + false ++ ++ ++ true + + + +diff --git a/Directory.Build.targets b/Directory.Build.targets +index 032ac8a48..6f81feb35 100644 +--- a/Directory.Build.targets ++++ b/Directory.Build.targets +@@ -8,7 +8,7 @@ + + + +- ++ + + + +diff --git a/azure-pipelines.yml b/azure-pipelines.yml +index 99d81090c..ca7f31c74 100644 +--- a/azure-pipelines.yml ++++ b/azure-pipelines.yml +@@ -110,6 +110,7 @@ stages: + enablePublishBuildArtifacts: true + enablePublishTestResults: true + enableTelemetry: true ++ enableSourcebuild: true + helixRepo: dotnet/razor + helixType: build.product/ + # enableMicrobuild can't be read from a user-defined variable (Azure DevOps limitation) +@@ -419,32 +420,6 @@ stages: + artifactType: Container + parallel: true + +- # Source build +- - job: Source_Build_Managed +- displayName: Source-Build (Managed) +- variables: +- - _BuildConfig: Release +- pool: +- ${{ if eq(variables['System.TeamProject'], 'public') }}: +- name: NetCore-Public +- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: +- name: NetCore1ESPool-Internal +- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 +- workspace: +- clean: all +- steps: +- - task: NodeTool@0 +- displayName: Install Node 10.x +- inputs: +- versionSpec: 10.x +- +- - powershell: npm install -g yarn +- displayName: Install yarn +- condition: succeeded() +- +- - template: /eng/common/templates/steps/source-build.yml +- + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: publishBuildAssets + displayName: Publish to Build Asset Registry +diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj +index 27c23c278..5f8232267 100644 +--- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj ++++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj +@@ -9,6 +9,7 @@ + false + $(NoWarn);RS2008 + enable ++ false + + + +diff --git a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj +index 63252918a..88f736348 100644 +--- a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj ++++ b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj +@@ -1,4 +1,4 @@ +- ++ + + + Transport package for Razor extension binaries. For internal use only. +@@ -6,6 +6,7 @@ + false + false + true ++ false + + + +diff --git a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj +index 19dde740a..a084f3e35 100644 +--- a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj ++++ b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj +@@ -1,4 +1,4 @@ +- ++ + + + Transport package for Razor compiler binaries. For internal use only. +@@ -6,6 +6,7 @@ + false + false + true ++ false + + + +diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props +index ac755a944..765281c47 100644 +--- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props ++++ b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props +@@ -1,7 +1,7 @@ + + + +- ++ + + <_SuppressSdkImports>true + ++ + +diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj b/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj +index a6634e072..b00f96694 100644 +--- a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj ++++ b/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj +@@ -4,6 +4,7 @@ + $(DefaultNetCoreTargetFramework);netstandard2.0;$(DefaultNetFxTargetFramework) + Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server library assets. + false ++ false + + + From a92c61849e0fe8119c6d160e0d8329b437db93ea Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Dec 2022 11:52:21 -0600 Subject: [PATCH 233/249] Move top-level packages dir into prereqs (#15140) --- src/SourceBuild/tarball/content/.gitignore | 2 +- .../tarball/content/Directory.Build.props | 13 +++++----- src/SourceBuild/tarball/content/build.sh | 25 +++++++++++-------- src/SourceBuild/tarball/content/prep.sh | 11 ++++---- .../content/prereqs/packages/archive/_ | 0 .../content/prereqs/packages/prebuilt/_ | 0 .../README.md | 2 +- 7 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 src/SourceBuild/tarball/content/prereqs/packages/archive/_ create mode 100644 src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ diff --git a/src/SourceBuild/tarball/content/.gitignore b/src/SourceBuild/tarball/content/.gitignore index 6694e6a2d..a5da6c81c 100644 --- a/src/SourceBuild/tarball/content/.gitignore +++ b/src/SourceBuild/tarball/content/.gitignore @@ -1,8 +1,8 @@ /.dotnet /artifacts -/packages /eng/tools/**/bin /eng/tools/**/obj +/prereqs/packages /src/linker/src/ILLink.Tasks/ILLink.Tasks.nuspec /src/nuget-client/NuGet.config /test/Microsoft.DotNet.SourceBuild.SmokeTests/bin diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index dc550accf..ff5ceda7d 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -39,8 +39,9 @@ $([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)')) $(ProjectDir).dotnet/ $(DotNetCliToolDir)dotnet + $(ProjectDir)prereqs/packages/ $(NuGetPackageRoot) - $(ProjectDir)packages/restored/ + $(PrereqsPackagesDir)restored/ $(PackagesDir)ArcadeBootstrapPackage/ $(NETCoreSdkVersion) @@ -105,9 +106,9 @@ $(IntermediatePath)blob-feed/ $(SourceBuiltBlobFeedDir)packages/ $(SourceBuiltBlobFeedDir)assets/ - $(ProjectDir)packages/prebuilt/ - $(ProjectDir)packages/previouslyRestored/ - $(ProjectDir)packages/previously-source-built/ + $(PrereqsPackagesDir)prebuilt/ + $(PrereqsPackagesDir)previouslyRestored/ + $(PrereqsPackagesDir)previously-source-built/ $(CustomPrebuiltSourceBuiltPackagesPath)/ $(OutputPath) $(LocalBlobStorageRoot)Sdk/ @@ -138,8 +139,8 @@ $(PackageReportDir)poisoned.txt $(BaseOutputPath)conflict-report/ $(PackageReportDir)PrebuiltBurndownData.csv - $(ProjectDir)packages/archive/ - $(ProjectDir)packages/reference/ + $(PrereqsPackagesDir)archive/ + $(PrereqsPackagesDir)reference/ Private.SourceBuilt.Artifacts Private.SourceBuilt.Prebuilts https://dotnetcli.azureedge.net/source-built-artifacts/assets/ diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 0a7763e46..a7d8113d4 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -23,6 +23,10 @@ CUSTOM_REF_PACKAGES_DIR='' CUSTOM_PACKAGES_DIR='' alternateTarget=false runningSmokeTests=false +packagesDir="$SCRIPT_ROOT/prereqs/packages/" +packagesArchiveDir="${packagesDir}archive/" +packagesRestoredDir="${packagesDir}restored/" +packagesPreviouslySourceBuiltDir="${packagesDir}previously-source-built/" CUSTOM_SDK_DIR='' while :; do @@ -95,14 +99,14 @@ if [ "$CUSTOM_PACKAGES_DIR" != "" ]; then fi fi -if [ -f "$SCRIPT_ROOT/packages/archive/archiveArtifacts.txt" ]; then +if [ -f "${packagesArchiveDir}archiveArtifacts.txt" ]; then ARCHIVE_ERROR=0 if [ ! -d "$SCRIPT_ROOT/.dotnet" ] && [ "$CUSTOM_SDK_DIR" == "" ]; then echo "ERROR: SDK not found at $SCRIPT_ROOT/.dotnet" ARCHIVE_ERROR=1 fi - if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PACKAGES_DIR" == "" ]; then - echo "ERROR: Private.SourceBuilt.Artifacts artifact not found at $SCRIPT_ROOT/packages/archive/ - Either run prep.sh or pass --with-packages parameter" + if [ ! -f ${packagesArchiveDir}Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PACKAGES_DIR" == "" ]; then + echo "ERROR: Private.SourceBuilt.Artifacts artifact not found at $packagesArchiveDir - Either run prep.sh or pass --with-packages parameter" ARCHIVE_ERROR=1 fi if [ $ARCHIVE_ERROR == 1 ]; then @@ -131,14 +135,13 @@ else fi packageVersionsPath='' -restoredPackagesDir="$SCRIPT_ROOT/packages/restored" if [[ "$CUSTOM_PACKAGES_DIR" != "" && -f "$CUSTOM_PACKAGES_DIR/PackageVersions.props" ]]; then packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props" -elif [ -d "$SCRIPT_ROOT/packages/archive" ]; then - sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` - if [ -f "$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props" ]; then - packageVersionsPath=$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props +elif [ -d "$packagesArchiveDir" ]; then + sourceBuiltArchive=`find $packagesArchiveDir -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` + if [ -f "${packagesPreviouslySourceBuiltDir}}PackageVersions.props" ]; then + packageVersionsPath=${packagesPreviouslySourceBuiltDir}PackageVersions.props elif [ -f "$sourceBuiltArchive" ]; then tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props packageVersionsPath=/tmp/PackageVersions.props @@ -147,7 +150,7 @@ fi if [ ! -f "$packageVersionsPath" ]; then echo "Cannot find PackagesVersions.props. Debugging info:" - echo " Attempted archive path: $SCRIPT_ROOT/packages/archive" + echo " Attempted archive path: $packagesArchiveDir" echo " Attempted custom PVP path: $CUSTOM_PACKAGES_DIR/PackageVersions.props" exit 1 fi @@ -162,7 +165,7 @@ if [[ $arcadeSdkLine =~ $versionPattern ]]; then # projects overwrite this so that they use the source-built Arcade SDK instad. export SOURCE_BUILT_SDK_ID_ARCADE=Microsoft.DotNet.Arcade.Sdk export SOURCE_BUILT_SDK_VERSION_ARCADE=$ARCADE_BOOTSTRAP_VERSION - export SOURCE_BUILT_SDK_DIR_ARCADE=$restoredPackagesDir/ArcadeBootstrapPackage/microsoft.dotnet.arcade.sdk/$ARCADE_BOOTSTRAP_VERSION + export SOURCE_BUILT_SDK_DIR_ARCADE=$packagesRestoredDir/ArcadeBootstrapPackage/microsoft.dotnet.arcade.sdk/$ARCADE_BOOTSTRAP_VERSION fi sourceLinkLine=`grep -m 1 'MicrosoftSourceLinkCommonVersion' "$packageVersionsPath"` @@ -174,7 +177,7 @@ fi echo "Found bootstrap SDK $SDK_VERSION, bootstrap Arcade $ARCADE_BOOTSTRAP_VERSION, bootstrap SourceLink $SOURCE_LINK_BOOTSTRAP_VERSION" export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export NUGET_PACKAGES=$restoredPackagesDir/ +export NUGET_PACKAGES=$packagesRestoredDir/ LogDateStamp=$(date +"%m%d%H%M%S") diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index aaba4f130..4fcb7e1bb 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -52,14 +52,15 @@ fi # Check if Private.SourceBuilt artifacts archive exists artifactsBaseFileName="Private.SourceBuilt.Artifacts" -if [ -f $SCRIPT_ROOT/packages/archive/$artifactsBaseFileName.*.tar.gz ]; then +packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" +if [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" -if [ -f $SCRIPT_ROOT/packages/archive/$prebuiltsBaseFileName.*.tar.gz ]; then +if [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi @@ -85,7 +86,7 @@ function DownloadArchive { if [[ $archiveVersionLine =~ $versionPattern ]]; then archiveUrl="${sourceBuiltArtifactsTarballUrl}${baseFileName}.${BASH_REMATCH[1]}.tar.gz" echo " Downloading source-built $archiveType from $archiveUrl..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $archiveUrl) + (cd $packagesArchiveDir && curl --retry 5 -O $archiveUrl) elif [ "$isRequired" == "true" ]; then echo " ERROR: $notFoundMessage" exit -1 @@ -128,13 +129,13 @@ if [ "$buildBootstrap" == "true" ]; then # Get PackageVersions.props from existing prev-sb archive echo " Retrieving PackageVersions.props from existing archive" - sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` + sourceBuiltArchive=`find $packagesArchiveDir -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` if [ -f "$sourceBuiltArchive" ]; then tar -xzf "$sourceBuiltArchive" -C $workingDir PackageVersions.props fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" # Remove working directory rm -rf $workingDir diff --git a/src/SourceBuild/tarball/content/prereqs/packages/archive/_ b/src/SourceBuild/tarball/content/prereqs/packages/archive/_ new file mode 100644 index 000000000..e69de29bb diff --git a/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ new file mode 100644 index 000000000..e69de29bb diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md index 416492a6e..5cd7d8e86 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md @@ -7,4 +7,4 @@ Some prerelease scenarios, usually security updates, require non-source-built packages which are not publicly available. Specify the directory where these packages can be found via the `SMOKE_TESTS_PREREQS_PATH` environment variable when running tests via `build.sh --run-smoke-test` e.g. -`SMOKE_TESTS_PREREQS_PATH=packages/smoke-test-prereqs`. +`SMOKE_TESTS_PREREQS_PATH=prereqs/packages/smoke-test-prereqs`. From 54d14d24d9334f0db81d9054e7fb8dde5424429a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Dec 2022 14:07:10 -0600 Subject: [PATCH 234/249] Remove backported source-build razor patch (#15147) --- ...uild-by-default-and-opt-in-instead-8.patch | 183 ------------------ 1 file changed, 183 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch diff --git a/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch b/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch deleted file mode 100644 index 0fa4e2be0..000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Disable-source-build-by-default-and-opt-in-instead-8.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Sienkiewicz -Date: Wed, 14 Dec 2022 21:05:57 -0800 -Subject: [PATCH] Disable source build by default, and opt in instead (#8019) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Add sln filter for source build - -* Use ExcludeSourceBuild instead - -* Put the correct default in 🤦‍♂️ - -* Don't include npm targets when all targets are suppressed - -* Don't override arcade for test projects when building from source - -* Use default source build jobs now we don't need node - -Backport: https://github.com/dotnet/razor/pull/8019 ---- - Directory.Build.props | 3 +++ - Directory.Build.targets | 2 +- - azure-pipelines.yml | 27 +------------------ - ...soft.NET.Sdk.Razor.SourceGenerators.csproj | 1 + - ...c.Razor.Extensions.Tooling.Internal.csproj | 3 ++- - ...CodeAnalysis.Razor.Tooling.Internal.csproj | 3 ++- - .../Directory.Build.props | 3 ++- - ...ft.AspNetCore.Razor.LanguageSupport.csproj | 1 + - 8 files changed, 13 insertions(+), 30 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index efc5ca9ab..9a8caccfb 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -37,6 +37,9 @@ - - - false -+ -+ -+ true - - - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 032ac8a48..6f81feb35 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -8,7 +8,7 @@ - - - -- -+ - - - -diff --git a/azure-pipelines.yml b/azure-pipelines.yml -index 99d81090c..ca7f31c74 100644 ---- a/azure-pipelines.yml -+++ b/azure-pipelines.yml -@@ -110,6 +110,7 @@ stages: - enablePublishBuildArtifacts: true - enablePublishTestResults: true - enableTelemetry: true -+ enableSourcebuild: true - helixRepo: dotnet/razor - helixType: build.product/ - # enableMicrobuild can't be read from a user-defined variable (Azure DevOps limitation) -@@ -419,32 +420,6 @@ stages: - artifactType: Container - parallel: true - -- # Source build -- - job: Source_Build_Managed -- displayName: Source-Build (Managed) -- variables: -- - _BuildConfig: Release -- pool: -- ${{ if eq(variables['System.TeamProject'], 'public') }}: -- name: NetCore-Public -- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: -- name: NetCore1ESPool-Internal -- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 -- workspace: -- clean: all -- steps: -- - task: NodeTool@0 -- displayName: Install Node 10.x -- inputs: -- versionSpec: 10.x -- -- - powershell: npm install -g yarn -- displayName: Install yarn -- condition: succeeded() -- -- - template: /eng/common/templates/steps/source-build.yml -- - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - stage: publishBuildAssets - displayName: Publish to Build Asset Registry -diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj -index 27c23c278..5f8232267 100644 ---- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj -+++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj -@@ -9,6 +9,7 @@ - false - $(NoWarn);RS2008 - enable -+ false - - - -diff --git a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj -index 63252918a..88f736348 100644 ---- a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj -+++ b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj -@@ -1,4 +1,4 @@ -- -+ - - - Transport package for Razor extension binaries. For internal use only. -@@ -6,6 +6,7 @@ - false - false - true -+ false - - - -diff --git a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj -index 19dde740a..a084f3e35 100644 ---- a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj -+++ b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj -@@ -1,4 +1,4 @@ -- -+ - - - Transport package for Razor compiler binaries. For internal use only. -@@ -6,6 +6,7 @@ - false - false - true -+ false - - - -diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props -index ac755a944..765281c47 100644 ---- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props -+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Directory.Build.props -@@ -1,7 +1,7 @@ - - - -- -+ - - <_SuppressSdkImports>true - -+ - -diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj b/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj -index a6634e072..b00f96694 100644 ---- a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj -+++ b/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj -@@ -4,6 +4,7 @@ - $(DefaultNetCoreTargetFramework);netstandard2.0;$(DefaultNetFxTargetFramework) - Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server library assets. - false -+ false - - - From 47a747f2265086a0b154d476df6fd633595ece7d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Dec 2022 16:23:50 -0600 Subject: [PATCH 235/249] Update source-build previous source-built artifacts (#15146) --- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index a3457effc..f68ff9865 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -24,6 +24,6 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100 + 7.0.100.2 From cfb4cdece9f85ce70da389ca8e77c0e3ae42f18c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Dec 2022 00:51:45 +0000 Subject: [PATCH 236/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221216.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22614.2 -> To Version 8.0.0-alpha.1.22616.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf58b4de8..78b50596f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a1cf9825ff1b8b666bb0da9f92c2df155a467855 + 31f422237eabbd5c89ecbd0f4a6f53e2c495422f From d9c5ac0870c64a4e8b1d1f0664bb9fd24df5fefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 20 Dec 2022 11:44:51 +0100 Subject: [PATCH 237/249] Fix branch filters for the VMR synchronization (#15156) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 364b149bc..aba326c8a 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -53,7 +53,7 @@ jobs: # For official builds, push the changes to the VMR # Push only main and release branches - - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), startswith(parameters.vmrBranch, 'refs/heads/release/'), startswith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: + - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), eq(parameters.vmrBranch, 'refs/heads/main'), startswith(parameters.vmrBranch, 'refs/heads/release/'), startswith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: - script: | set -x git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' From ec531541003e6d7a3b730151b1a45da970fa8051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 20 Dec 2022 14:29:00 +0100 Subject: [PATCH 238/249] Fix branch filters for the VMR synchronization (#15158) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index aba326c8a..832265db5 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -53,7 +53,7 @@ jobs: # For official builds, push the changes to the VMR # Push only main and release branches - - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), eq(parameters.vmrBranch, 'refs/heads/main'), startswith(parameters.vmrBranch, 'refs/heads/release/'), startswith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: + - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: - script: | set -x git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' From bbd2f682dcea4d31e60e9d11c98cd05331ba2d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 20 Dec 2022 16:01:14 +0100 Subject: [PATCH 239/249] Fix branch filters for the VMR synchronization (#15160) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 832265db5..039bf913c 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -53,7 +53,7 @@ jobs: # For official builds, push the changes to the VMR # Push only main and release branches - - ${{ if and(not(parameters.noPush), or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: + - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: - script: | set -x git config --global user.email 'dotnet-maestro[bot]@users.noreply.github.com' && git config --global user.name 'dotnet-maestro[bot]' @@ -64,3 +64,4 @@ jobs: git push dotnet ${{ parameters.vmrBranch }} displayName: Push changes to dotnet/dotnet workingDirectory: $(vmrPath) + condition: and(succeeded(), or(eq('${{ parameters.vmrBranch }}', 'main'), startsWith('${{ parameters.vmrBranch }}', 'release/'))) From 0d24684503c007748bf73aa78e1242dc095667ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 20 Dec 2022 19:24:30 +0100 Subject: [PATCH 240/249] Fix branch filters for the VMR synchronization (#15161) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 2 +- eng/pipelines/templates/steps/vmr-pull-updates.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 039bf913c..22c30e66f 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -64,4 +64,4 @@ jobs: git push dotnet ${{ parameters.vmrBranch }} displayName: Push changes to dotnet/dotnet workingDirectory: $(vmrPath) - condition: and(succeeded(), or(eq('${{ parameters.vmrBranch }}', 'main'), startsWith('${{ parameters.vmrBranch }}', 'release/'))) + condition: and(succeeded(), or(eq(variables['vmrBranch'], 'main'), startsWith(variables['vmrBranch'], 'release/'))) diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 0fb3ca76d..91ed52df0 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -29,7 +29,9 @@ steps: displayName: Restore darc workingDirectory: $(Agent.BuildDirectory)/installer -- script: git checkout -B ${{ parameters.vmrBranch }} +- script: | + git checkout -B ${{ parameters.vmrBranch }} + echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}" displayName: Prepare branch ${{ parameters.vmrBranch }} workingDirectory: ${{ parameters.vmrPath }} From 9d67854a55a1bc350923943aad538bb4b5b0e349 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 00:24:09 +0000 Subject: [PATCH 241/249] [main] Update dependencies from dotnet/emsdk dotnet/arcade-services (#15159) [main] Update dependencies from dotnet/emsdk dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1bf2fbfd2..be9acd85d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22615.1", + "version": "1.1.0-beta.22620.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d343831e7..0f337e92d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9d8545dee0b3b8ae7dcc357fc5c0598487e8df1d + 66b984594a008151bdb14dc60589373e3d44be83 - + https://github.com/dotnet/emsdk - 9d8545dee0b3b8ae7dcc357fc5c0598487e8df1d + 66b984594a008151bdb14dc60589373e3d44be83 https://github.com/dotnet/deployment-tools @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade-services - 77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8 + a15b2ccfd23a56ac9314ce91ea2d00f514b29856 - + https://github.com/dotnet/arcade-services - 77b07fcd4e3d68ee364d1d7f7a7b6debfa7546a8 + a15b2ccfd23a56ac9314ce91ea2d00f514b29856 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b23660bfb..cc5b6f750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22615.1 + 1.1.0-beta.22620.1 @@ -200,8 +200,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22612.1 - 8.0.0-alpha.1.22612.1 + 8.0.0-alpha.1.22620.1 + 8.0.0-alpha.1.22620.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) From 094ab5eb7fe82de2abb80ad16f3f6400607a5404 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Wed, 21 Dec 2022 00:52:46 +0000 Subject: [PATCH 242/249] Bump 8.0 version --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 8f812954d..ef365ffaf 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -411,7 +411,7 @@ Copyright (c) .NET Foundation. All rights reserved. + ILLinkPackVersion="8.0.100-1.22619.1" /> Date: Wed, 21 Dec 2022 17:46:06 +0100 Subject: [PATCH 243/249] Fix VMR initialization (#15169) Co-authored-by: Andrii Patsula --- eng/Build.props | 1 - eng/Versions.props | 6 +++ src/VirtualMonoRepo/InitializeVMR.proj | 23 +++----- .../Tasks/GitFileManagerFactory.cs | 52 +++++++++++++++++++ .../Tasks/VirtualMonoRepo_Initialize.cs | 5 +- src/VirtualMonoRepo/source-mappings.json | 4 +- 6 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs diff --git a/eng/Build.props b/eng/Build.props index ff9b72504..7e501b9fc 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -3,7 +3,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index cc5b6f750..41f5f60b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,6 +204,12 @@ 8.0.0-alpha.1.22620.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) + + + + 15.7.179 + 15.7.179 + 2.0.1-servicing-26011-01 diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index fb5070017..b534c897a 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -13,8 +13,6 @@ true - - $(TarballGitInfoDir) @@ -30,9 +28,7 @@ Instead of cloning the repositories, we pull the sources via the `darc vmr initialize` command. Most of the targets are reused from the tarball generation process (SourceBuildArcadeTarball.targets). --> - @@ -50,26 +46,24 @@ - + + + + + $([System.IO.Path]::GetFileName("$(RepoRoot.TrimEnd('/').TrimEnd('\\'))")) @(RootRepoCommitSha) - - - - - - + - diff --git a/src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs b/src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs new file mode 100644 index 000000000..2da3d540b --- /dev/null +++ b/src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using Microsoft.DotNet.DarcLib; +using Microsoft.DotNet.DarcLib.Helpers; +using Microsoft.DotNet.DarcLib.VirtualMonoRepo; +using Microsoft.Extensions.Logging; + +namespace Microsoft.DotNet.VirtualMonoRepo.Tasks; + +public class GitFileManagerFactory : IGitFileManagerFactory +{ + private readonly IVmrInfo _vmrInfo; + private readonly VmrRemoteConfiguration _remoteConfiguration; + private readonly IProcessManager _processManager; + private readonly IVersionDetailsParser _versionDetailsParser; + private readonly ILoggerFactory _loggerFactory; + + public GitFileManagerFactory( + IVmrInfo vmrInfo, + VmrRemoteConfiguration remoteConfiguration, + IProcessManager processManager, + IVersionDetailsParser versionDetailsParser, + ILoggerFactory loggerFactory) + { + _vmrInfo = vmrInfo; + _remoteConfiguration = remoteConfiguration; + _processManager = processManager; + _versionDetailsParser = versionDetailsParser; + _loggerFactory = loggerFactory; + } + + public IGitFileManager Create(string repoUri) + => new GitFileManager(CreateGitRepo(repoUri), _versionDetailsParser, _loggerFactory.CreateLogger()); + + private IGitRepo CreateGitRepo(string repoUri) => GitRepoTypeParser.ParseFromUri(repoUri) switch + { + GitRepoType.AzureDevOps => throw new Exception("VMR initialization should not require Azure DevOps repositories"), + + GitRepoType.GitHub => new GitHubClient( + _processManager.GitExecutable, + _remoteConfiguration.GitHubToken, + _loggerFactory.CreateLogger(), + _vmrInfo.TmpPath, + // Caching not in use for Darc local client. + null), + + GitRepoType.Local => new LocalGitClient(_processManager.GitExecutable, _loggerFactory.CreateLogger()), + _ => throw new ArgumentException("Unknown git repository type", nameof(repoUri)), + }; +} diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 6390e4b56..307ee8ecc 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -7,8 +7,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Build.Framework; -using Microsoft.DotNet.DarcLib; -using Microsoft.DotNet.DarcLib.Helpers; using Microsoft.DotNet.DarcLib.VirtualMonoRepo; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -61,6 +59,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask private IServiceProvider CreateServiceProvider() => new ServiceCollection() .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information)) - .AddVmrManagers("git", VmrPath, TmpPath, null, null) + .AddTransient() + .AddVmrManagers(sp => sp.GetRequiredService(), "git", VmrPath, TmpPath, null, null) .BuildServiceProvider(); } diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 0f2620a51..95e8f949c 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -105,8 +105,8 @@ "defaultRef": "dev" }, { - "name": "razor-compiler", - "defaultRemote": "https://github.com/dotnet/razor-compiler" + "name": "razor", + "defaultRemote": "https://github.com/dotnet/razor" }, { "name": "roslyn", From 5aac0db522c1e9471c91c21516c7049a783bd4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 21 Dec 2022 21:47:54 +0100 Subject: [PATCH 244/249] Move `src/SourceBuild/tarball/*` up one folder (#15166) --- .vsts-ci.yml | 11 ++++++----- eng/vmr-sync.sh | 2 +- src/SourceBuild/README.md | 2 +- src/SourceBuild/{tarball => }/content/.gitignore | 0 .../{tarball => }/content/CODE_OF_CONDUCT.md | 0 .../{tarball => }/content/Directory.Build.props | 0 .../{tarball => }/content/Directory.Build.targets | 0 src/SourceBuild/{tarball => }/content/LICENSE.TXT | 0 src/SourceBuild/{tarball => }/content/SECURITY.md | 0 src/SourceBuild/{tarball => }/content/build.proj | 0 src/SourceBuild/{tarball => }/content/build.sh | 0 .../{tarball => }/content/eng/Build.props | 0 src/SourceBuild/{tarball => }/content/eng/No.proj | 0 .../{tarball => }/content/eng/Versions.props | 0 .../eng/arcade-overrides/AfterSourceBuild.proj | 0 .../arcade-overrides/SourceBuildArcadeBuild.targets | 0 .../arcade-overrides/SourceBuildArcadeTools.targets | 0 .../eng/bootstrap/OverrideBootstrapVersions.props | 0 .../content/eng/bootstrap/README.template.md | 2 +- .../eng/bootstrap/THIRD-PARTY-NOTICES.template.txt | 0 .../eng/bootstrap/buildBootstrapPreviouslySB.csproj | 0 .../content/eng/install-nuget-credprovider.sh | 0 .../{tarball => }/content/eng/pipelines/ci.yml | 0 .../eng/pipelines/security-partners-dotnet.yml | 0 .../content/eng/tools/Directory.Build.props | 0 .../content/eng/tools/EmptySdk/Sdk/Sdk.props | 0 .../content/eng/tools/EmptySdk/Sdk/Sdk.targets | 0 .../tools/generate-graphviz/generate-graphviz.proj | 0 .../{tarball => }/content/eng/tools/init-build.proj | 0 .../content/eng/tools/tasks/Directory.Build.props | 0 .../CatalogFileEntry.cs | 0 .../CatalogPackageEntry.cs | 0 .../CheckForPoison.cs | 0 .../MarkAndCatalogPackages.cs | 0 ...ft.DotNet.SourceBuild.Tasks.LeakDetection.csproj | 0 .../NuGet.Config | 0 .../PoisonMatch.cs | 0 .../PoisonType.cs | 0 .../PoisonedFileEntry.cs | 0 .../Utility.cs | 0 .../_._ | 0 .../AddRidToRuntimeJson.cs | 0 .../AddSourceToNuGetConfig.cs | 0 .../AzureConnectionStringBuildTask.cs | 0 .../AzureHelper.cs | 0 .../BuildTask.cs | 0 .../DownloadFileSB.cs | 0 .../EnumerableExtensions.cs | 0 .../FileUtilities.cs | 0 .../FixPathSeparator.cs | 0 .../Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs | 0 .../Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj | 0 .../Models/VersionDetailsXml.cs | 0 .../NuGetPack.cs | 0 .../NuspecPropertyStringProvider.cs | 0 .../PackagingTask.cs | 0 .../ReadNuGetPackageInfos.cs | 0 .../RemoveInternetSourcesFromNuGetConfig.cs | 0 .../ReplaceFeedsInNuGetConfig.cs | 0 .../ReplaceRegexInFiles.cs | 0 .../ReplaceTextInFile.cs | 0 .../ReplaceTextInFiles.cs | 0 .../RepoTasks/JoinItems.cs | 0 .../UpdateJson.cs | 0 .../UpdateNuGetConfigPackageSourcesMappings.cs | 0 .../UploadClient.cs | 0 .../UploadToAzure.cs | 0 .../UsageReport/AnnotatedUsage.cs | 0 .../UsageReport/Usage.cs | 0 .../UsageReport/UsageData.cs | 0 .../UsageReport/ValidateUsageAgainstBaseline.cs | 0 .../UsageReport/WritePackageUsageData.cs | 0 .../UsageReport/WriteUsageBurndownData.cs | 0 .../UsageReport/WriteUsageReports.cs | 0 .../UsageReport/XmlParsingHelpers.cs | 0 .../WriteBuildOutputProps.cs | 0 .../WriteRestoreSourceAndVersionProps.cs | 0 .../WriteRestoreSourceProps.cs | 0 .../WriteVersionsFile.cs | 0 .../ZipFileExtractToDirectory.cs | 0 .../Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ | 0 .../SourceBuild.MSBuildSdkResolver.csproj | 0 .../SourceBuiltSdkResolver.cs | 0 src/SourceBuild/{tarball => }/content/global.json | 0 src/SourceBuild/{tarball => }/content/prep.sh | 0 .../content/prereqs/keys/Newtonsoft.Json.snk | Bin .../content/prereqs/keys/NuGet.Client.snk | Bin .../{tarball => }/content/prereqs/keys/README.md | 0 .../content/repo-projects/Directory.Build.props | 0 .../content/repo-projects/Directory.Build.targets | 0 .../{tarball => }/content/repo-projects/arcade.proj | 0 .../content/repo-projects/aspnetcore.proj | 0 .../content/repo-projects/command-line-api.proj | 0 .../content/repo-projects/deployment-tools.proj | 0 .../content/repo-projects/diagnostics.proj | 0 .../{tarball => }/content/repo-projects/format.proj | 0 .../{tarball => }/content/repo-projects/fsharp.proj | 0 .../content/repo-projects/installer.proj | 0 .../content/repo-projects/known-good-tests.proj | 0 .../content/repo-projects/known-good.proj | 0 .../{tarball => }/content/repo-projects/linker.proj | 0 .../content/repo-projects/msbuild.proj | 0 .../content/repo-projects/nuget-client.proj | 0 .../content/repo-projects/package-source-build.proj | 0 .../{tarball => }/content/repo-projects/razor.proj | 0 .../content/repo-projects/roslyn-analyzers.proj | 0 .../{tarball => }/content/repo-projects/roslyn.proj | 0 .../content/repo-projects/runtime.proj | 0 .../{tarball => }/content/repo-projects/sdk.proj | 0 .../repo-projects/source-build-externals.proj | 0 .../source-build-reference-packages.proj | 0 .../content/repo-projects/sourcelink.proj | 0 .../content/repo-projects/symreader.proj | 0 .../content/repo-projects/templating.proj | 0 .../content/repo-projects/test-templates.proj | 0 .../{tarball => }/content/repo-projects/vstest.proj | 0 .../{tarball => }/content/repo-projects/xdt.proj | 0 .../content/repo-projects/xliff-tasks.proj | 0 .../{tarball => }/content/src/Directory.Build.props | 0 .../content/src/Directory.Build.targets | 0 .../content/test/Directory.Build.props | 0 .../content/test/Directory.Build.targets | 0 .../BaselineHelper.cs | 0 .../BasicScenarioTests.cs | 0 .../Config.cs | 0 .../DotNetActions.cs | 0 .../DotNetFormatTests.cs | 0 .../DotNetHelper.cs | 0 .../DotNetLanguage.cs | 0 .../DotNetLanguageExtensions.cs | 0 .../DotNetTemplate.cs | 0 .../DotNetTemplateExtensions.cs | 0 .../DotNetWatchTests.cs | 0 .../ExecuteHelper.cs | 0 .../HttpClientExtensions.cs | 0 .../Microsoft.DotNet.SourceBuild.SmokeTests.csproj | 0 .../Microsoft.DotNet.SourceBuild.SmokeTests.sln | 0 .../OmniSharpTests.cs | 0 .../PoisonTests.cs | 0 .../README.md | 0 .../SdkContentTests.cs | 0 .../SkippableFactAttribute.cs | 0 .../SkippableTheoryAttribute.cs | 0 .../SmokeTests.cs | 0 .../TestScenario.cs | 0 .../Utilities.cs | 0 .../WebScenarioTests.cs | 0 .../assets/FormatTestUnformatted.cs | 0 .../assets/baselines/FormatTestFormatted.cs | 0 .../assets/baselines/MsftToSbSdk.diff | 0 .../assets/baselines/PoisonUsage.txt | 0 .../assets/local.NuGet.Config | 0 .../assets/online.NuGet.Config | 0 ...ble-package-validation-during-source-build.patch | 0 .../aspnetcore/0002-IDE0060-workaround.patch | 0 ...pre-built-assets-during-source-build-for-r.patch | 0 .../tarball/content/prereqs/packages/archive/_ | 0 .../tarball/content/prereqs/packages/prebuilt/_ | 0 src/VirtualMonoRepo/source-mappings.json | 6 +++--- 159 files changed, 12 insertions(+), 11 deletions(-) rename src/SourceBuild/{tarball => }/content/.gitignore (100%) rename src/SourceBuild/{tarball => }/content/CODE_OF_CONDUCT.md (100%) rename src/SourceBuild/{tarball => }/content/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/Directory.Build.targets (100%) rename src/SourceBuild/{tarball => }/content/LICENSE.TXT (100%) rename src/SourceBuild/{tarball => }/content/SECURITY.md (100%) rename src/SourceBuild/{tarball => }/content/build.proj (100%) rename src/SourceBuild/{tarball => }/content/build.sh (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/Build.props (100%) rename src/SourceBuild/{tarball => }/content/eng/No.proj (100%) rename src/SourceBuild/{tarball => }/content/eng/Versions.props (100%) rename src/SourceBuild/{tarball => }/content/eng/arcade-overrides/AfterSourceBuild.proj (100%) rename src/SourceBuild/{tarball => }/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets (100%) rename src/SourceBuild/{tarball => }/content/eng/arcade-overrides/SourceBuildArcadeTools.targets (100%) rename src/SourceBuild/{tarball => }/content/eng/bootstrap/OverrideBootstrapVersions.props (100%) rename src/SourceBuild/{tarball => }/content/eng/bootstrap/README.template.md (98%) rename src/SourceBuild/{tarball => }/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt (100%) rename src/SourceBuild/{tarball => }/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj (100%) rename src/SourceBuild/{tarball => }/content/eng/install-nuget-credprovider.sh (100%) rename src/SourceBuild/{tarball => }/content/eng/pipelines/ci.yml (100%) rename src/SourceBuild/{tarball => }/content/eng/pipelines/security-partners-dotnet.yml (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/EmptySdk/Sdk/Sdk.props (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/EmptySdk/Sdk/Sdk.targets (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/generate-graphviz/generate-graphviz.proj (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/init-build.proj (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ (100%) rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs (100%) rename src/SourceBuild/{tarball => }/content/global.json (100%) rename src/SourceBuild/{tarball => }/content/prep.sh (100%) mode change 100755 => 100644 rename src/SourceBuild/{tarball => }/content/prereqs/keys/Newtonsoft.Json.snk (100%) rename src/SourceBuild/{tarball => }/content/prereqs/keys/NuGet.Client.snk (100%) rename src/SourceBuild/{tarball => }/content/prereqs/keys/README.md (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/Directory.Build.targets (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/arcade.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/aspnetcore.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/command-line-api.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/deployment-tools.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/diagnostics.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/format.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/fsharp.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/installer.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/known-good-tests.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/known-good.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/linker.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/msbuild.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/nuget-client.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/package-source-build.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/razor.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/roslyn-analyzers.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/roslyn.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/runtime.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/sdk.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/source-build-externals.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/source-build-reference-packages.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/sourcelink.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/symreader.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/templating.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/test-templates.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/vstest.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/xdt.proj (100%) rename src/SourceBuild/{tarball => }/content/repo-projects/xliff-tasks.proj (100%) rename src/SourceBuild/{tarball => }/content/src/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/src/Directory.Build.targets (100%) rename src/SourceBuild/{tarball => }/content/test/Directory.Build.props (100%) rename src/SourceBuild/{tarball => }/content/test/Directory.Build.targets (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config (100%) rename src/SourceBuild/{tarball => }/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config (100%) rename src/SourceBuild/{tarball => }/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch (100%) rename src/SourceBuild/{tarball => }/patches/aspnetcore/0002-IDE0060-workaround.patch (100%) rename src/SourceBuild/{tarball => }/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch (100%) delete mode 100644 src/SourceBuild/tarball/content/prereqs/packages/archive/_ delete mode 100644 src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 59526b0ca..89b59ca95 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -373,11 +373,12 @@ stages: # the VMR synchronization step is run to validate that the PR can be merged and later # synchronized into the VMR without problems. # You can do this by allowing the Synchronize_VMR stage from above in PRs. -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: eng/pipelines/templates/stages/vmr-build.yml - parameters: - vmrBranch: ${{ parameters.vmrBranch }} - isBuiltFromVmr: false +# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184) +# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: +# - template: eng/pipelines/templates/stages/vmr-build.yml +# parameters: +# vmrBranch: ${{ parameters.vmrBranch }} +# isBuiltFromVmr: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index f948ff503..16f302215 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -22,7 +22,7 @@ ### ### The whole process can be reproduced locally easily by running this script. ### The patches are located in a folder in the 'dotnet/installer' repository. -### At the moment of writing, the location is 'src/SourceBuild/tarball/patches' but to get +### At the moment of writing, the location is 'src/SourceBuild/patches' but to get ### the up-to-date location, please see the 'patchesPath' property in ### https://github.com/dotnet/dotnet/blob/main/src/source-mappings.json ### diff --git a/src/SourceBuild/README.md b/src/SourceBuild/README.md index cb90757a6..7fb9a6e6a 100644 --- a/src/SourceBuild/README.md +++ b/src/SourceBuild/README.md @@ -44,7 +44,7 @@ git format-patch --zero-commit --no-signature -1 ``` Then, move the patch file into this repo, at -`src/SourceBuild/tarball/patches/`. +`src/SourceBuild/patches/`. > If you define `PATCH_DIR` to point at the `patches` directory, you can use > `-o` to place the patch file directly in the right directory: diff --git a/src/SourceBuild/tarball/content/.gitignore b/src/SourceBuild/content/.gitignore similarity index 100% rename from src/SourceBuild/tarball/content/.gitignore rename to src/SourceBuild/content/.gitignore diff --git a/src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md b/src/SourceBuild/content/CODE_OF_CONDUCT.md similarity index 100% rename from src/SourceBuild/tarball/content/CODE_OF_CONDUCT.md rename to src/SourceBuild/content/CODE_OF_CONDUCT.md diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/Directory.Build.props rename to src/SourceBuild/content/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets similarity index 100% rename from src/SourceBuild/tarball/content/Directory.Build.targets rename to src/SourceBuild/content/Directory.Build.targets diff --git a/src/SourceBuild/tarball/content/LICENSE.TXT b/src/SourceBuild/content/LICENSE.TXT similarity index 100% rename from src/SourceBuild/tarball/content/LICENSE.TXT rename to src/SourceBuild/content/LICENSE.TXT diff --git a/src/SourceBuild/tarball/content/SECURITY.md b/src/SourceBuild/content/SECURITY.md similarity index 100% rename from src/SourceBuild/tarball/content/SECURITY.md rename to src/SourceBuild/content/SECURITY.md diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/content/build.proj similarity index 100% rename from src/SourceBuild/tarball/content/build.proj rename to src/SourceBuild/content/build.proj diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/content/build.sh old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/build.sh rename to src/SourceBuild/content/build.sh diff --git a/src/SourceBuild/tarball/content/eng/Build.props b/src/SourceBuild/content/eng/Build.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/Build.props rename to src/SourceBuild/content/eng/Build.props diff --git a/src/SourceBuild/tarball/content/eng/No.proj b/src/SourceBuild/content/eng/No.proj similarity index 100% rename from src/SourceBuild/tarball/content/eng/No.proj rename to src/SourceBuild/content/eng/No.proj diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/Versions.props rename to src/SourceBuild/content/eng/Versions.props diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/AfterSourceBuild.proj b/src/SourceBuild/content/eng/arcade-overrides/AfterSourceBuild.proj similarity index 100% rename from src/SourceBuild/tarball/content/eng/arcade-overrides/AfterSourceBuild.proj rename to src/SourceBuild/content/eng/arcade-overrides/AfterSourceBuild.proj diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets similarity index 100% rename from src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets rename to src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeBuild.targets diff --git a/src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeTools.targets b/src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeTools.targets similarity index 100% rename from src/SourceBuild/tarball/content/eng/arcade-overrides/SourceBuildArcadeTools.targets rename to src/SourceBuild/content/eng/arcade-overrides/SourceBuildArcadeTools.targets diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props rename to src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md b/src/SourceBuild/content/eng/bootstrap/README.template.md similarity index 98% rename from src/SourceBuild/tarball/content/eng/bootstrap/README.template.md rename to src/SourceBuild/content/eng/bootstrap/README.template.md index d092f1f4f..455afb472 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/README.template.md +++ b/src/SourceBuild/content/eng/bootstrap/README.template.md @@ -10,7 +10,7 @@ What this means: In the VMR, you can find: - source files of [each product repository](#list-of-components) which are mirrored inside of their respective directories under [`src/`](https://github.com/dotnet/dotnet/tree/main/src), - tooling that enables [building the whole .NET product from source](https://github.com/dotnet/source-build) on Linux platforms, -- small customizations, in the form of [patches](https://github.com/dotnet/dotnet/tree/main/src/installer/src/SourceBuild/tarball/patches), applied on top of the original code to make the build possible, +- small customizations, in the form of [patches](https://github.com/dotnet/dotnet/tree/main/src/installer/src/SourceBuild/patches), applied on top of the original code to make the build possible, - *[in future]* E2E tests for the whole .NET product. Just like the development repositories, the VMR will have a release branch for every feature band (e.g. `release/8.0.1xx-preview1`). diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt b/src/SourceBuild/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt similarity index 100% rename from src/SourceBuild/tarball/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt rename to src/SourceBuild/content/eng/bootstrap/THIRD-PARTY-NOTICES.template.txt diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj similarity index 100% rename from src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj rename to src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj diff --git a/src/SourceBuild/tarball/content/eng/install-nuget-credprovider.sh b/src/SourceBuild/content/eng/install-nuget-credprovider.sh similarity index 100% rename from src/SourceBuild/tarball/content/eng/install-nuget-credprovider.sh rename to src/SourceBuild/content/eng/install-nuget-credprovider.sh diff --git a/src/SourceBuild/tarball/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml similarity index 100% rename from src/SourceBuild/tarball/content/eng/pipelines/ci.yml rename to src/SourceBuild/content/eng/pipelines/ci.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/content/eng/pipelines/security-partners-dotnet.yml similarity index 100% rename from src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml rename to src/SourceBuild/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/tools/Directory.Build.props b/src/SourceBuild/content/eng/tools/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/Directory.Build.props rename to src/SourceBuild/content/eng/tools/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.props rename to src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.props diff --git a/src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.targets b/src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.targets similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/EmptySdk/Sdk/Sdk.targets rename to src/SourceBuild/content/eng/tools/EmptySdk/Sdk/Sdk.targets diff --git a/src/SourceBuild/tarball/content/eng/tools/generate-graphviz/generate-graphviz.proj b/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/generate-graphviz/generate-graphviz.proj rename to src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj diff --git a/src/SourceBuild/tarball/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/init-build.proj rename to src/SourceBuild/content/eng/tools/init-build.proj diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Directory.Build.props b/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Directory.Build.props rename to src/SourceBuild/content/eng/tools/tasks/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogFileEntry.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CatalogPackageEntry.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/NuGet.Config diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonMatch.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonType.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/PoisonedFileEntry.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Utility.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/_._ diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddRidToRuntimeJson.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureConnectionStringBuildTask.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AzureHelper.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/DownloadFileSB.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FixPathSeparator.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuGetPack.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/NuspecPropertyStringProvider.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PackagingTask.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFiles.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RepoTasks/JoinItems.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadClient.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UploadToAzure.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteVersionsFile.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ZipFileExtractToDirectory.cs diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/_._ diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj rename to src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj diff --git a/src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs similarity index 100% rename from src/SourceBuild/tarball/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs rename to src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/content/global.json similarity index 100% rename from src/SourceBuild/tarball/content/global.json rename to src/SourceBuild/content/global.json diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/content/prep.sh old mode 100755 new mode 100644 similarity index 100% rename from src/SourceBuild/tarball/content/prep.sh rename to src/SourceBuild/content/prep.sh diff --git a/src/SourceBuild/tarball/content/prereqs/keys/Newtonsoft.Json.snk b/src/SourceBuild/content/prereqs/keys/Newtonsoft.Json.snk similarity index 100% rename from src/SourceBuild/tarball/content/prereqs/keys/Newtonsoft.Json.snk rename to src/SourceBuild/content/prereqs/keys/Newtonsoft.Json.snk diff --git a/src/SourceBuild/tarball/content/prereqs/keys/NuGet.Client.snk b/src/SourceBuild/content/prereqs/keys/NuGet.Client.snk similarity index 100% rename from src/SourceBuild/tarball/content/prereqs/keys/NuGet.Client.snk rename to src/SourceBuild/content/prereqs/keys/NuGet.Client.snk diff --git a/src/SourceBuild/tarball/content/prereqs/keys/README.md b/src/SourceBuild/content/prereqs/keys/README.md similarity index 100% rename from src/SourceBuild/tarball/content/prereqs/keys/README.md rename to src/SourceBuild/content/prereqs/keys/README.md diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/Directory.Build.props rename to src/SourceBuild/content/repo-projects/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/Directory.Build.targets rename to src/SourceBuild/content/repo-projects/Directory.Build.targets diff --git a/src/SourceBuild/tarball/content/repo-projects/arcade.proj b/src/SourceBuild/content/repo-projects/arcade.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/arcade.proj rename to src/SourceBuild/content/repo-projects/arcade.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/aspnetcore.proj rename to src/SourceBuild/content/repo-projects/aspnetcore.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/command-line-api.proj rename to src/SourceBuild/content/repo-projects/command-line-api.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/deployment-tools.proj rename to src/SourceBuild/content/repo-projects/deployment-tools.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/diagnostics.proj rename to src/SourceBuild/content/repo-projects/diagnostics.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/format.proj rename to src/SourceBuild/content/repo-projects/format.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/fsharp.proj rename to src/SourceBuild/content/repo-projects/fsharp.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/installer.proj rename to src/SourceBuild/content/repo-projects/installer.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj b/src/SourceBuild/content/repo-projects/known-good-tests.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/known-good-tests.proj rename to src/SourceBuild/content/repo-projects/known-good-tests.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/known-good.proj b/src/SourceBuild/content/repo-projects/known-good.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/known-good.proj rename to src/SourceBuild/content/repo-projects/known-good.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/linker.proj b/src/SourceBuild/content/repo-projects/linker.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/linker.proj rename to src/SourceBuild/content/repo-projects/linker.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/msbuild.proj rename to src/SourceBuild/content/repo-projects/msbuild.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/nuget-client.proj rename to src/SourceBuild/content/repo-projects/nuget-client.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/package-source-build.proj rename to src/SourceBuild/content/repo-projects/package-source-build.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/razor.proj rename to src/SourceBuild/content/repo-projects/razor.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/roslyn-analyzers.proj rename to src/SourceBuild/content/repo-projects/roslyn-analyzers.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/roslyn.proj rename to src/SourceBuild/content/repo-projects/roslyn.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/runtime.proj rename to src/SourceBuild/content/repo-projects/runtime.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/sdk.proj rename to src/SourceBuild/content/repo-projects/sdk.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/source-build-externals.proj rename to src/SourceBuild/content/repo-projects/source-build-externals.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/source-build-reference-packages.proj rename to src/SourceBuild/content/repo-projects/source-build-reference-packages.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/sourcelink.proj rename to src/SourceBuild/content/repo-projects/sourcelink.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/symreader.proj rename to src/SourceBuild/content/repo-projects/symreader.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/templating.proj rename to src/SourceBuild/content/repo-projects/templating.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/test-templates.proj rename to src/SourceBuild/content/repo-projects/test-templates.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/vstest.proj rename to src/SourceBuild/content/repo-projects/vstest.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/xdt.proj b/src/SourceBuild/content/repo-projects/xdt.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/xdt.proj rename to src/SourceBuild/content/repo-projects/xdt.proj diff --git a/src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj similarity index 100% rename from src/SourceBuild/tarball/content/repo-projects/xliff-tasks.proj rename to src/SourceBuild/content/repo-projects/xliff-tasks.proj diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.props b/src/SourceBuild/content/src/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/src/Directory.Build.props rename to src/SourceBuild/content/src/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.targets b/src/SourceBuild/content/src/Directory.Build.targets similarity index 100% rename from src/SourceBuild/tarball/content/src/Directory.Build.targets rename to src/SourceBuild/content/src/Directory.Build.targets diff --git a/src/SourceBuild/tarball/content/test/Directory.Build.props b/src/SourceBuild/content/test/Directory.Build.props similarity index 100% rename from src/SourceBuild/tarball/content/test/Directory.Build.props rename to src/SourceBuild/content/test/Directory.Build.props diff --git a/src/SourceBuild/tarball/content/test/Directory.Build.targets b/src/SourceBuild/content/test/Directory.Build.targets similarity index 100% rename from src/SourceBuild/tarball/content/test/Directory.Build.targets rename to src/SourceBuild/content/test/Directory.Build.targets diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch similarity index 100% rename from src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch rename to src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch b/src/SourceBuild/patches/aspnetcore/0002-IDE0060-workaround.patch similarity index 100% rename from src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch rename to src/SourceBuild/patches/aspnetcore/0002-IDE0060-workaround.patch diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch similarity index 100% rename from src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch rename to src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch diff --git a/src/SourceBuild/tarball/content/prereqs/packages/archive/_ b/src/SourceBuild/tarball/content/prereqs/packages/archive/_ deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_ deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 95e8f949c..6f81eabc2 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -10,13 +10,13 @@ { // Location within the VMR where the source-build patches are stored // These patches are applied on top of the code synchronized into the VMR - "patchesPath": "src/installer/src/SourceBuild/tarball/patches", + "patchesPath": "src/installer/src/SourceBuild/patches", // Some files are copied outside of the src/ directory into other locations // When files in the source paths are changed, they are automatically synchronized too "additionalMappings": [ { - "source": "src/installer/src/SourceBuild/tarball/content", + "source": "src/installer/src/SourceBuild/content", "destination": "" }, { @@ -82,7 +82,7 @@ "defaultRemote": "https://github.com/dotnet/installer", "exclude": [ // We don't need the tarball content in the VMR again, it's already copied in the root - "src/SourceBuild/tarball/content/**/*" + "src/SourceBuild/content/**/*" ] }, { From 688c0c534f40d826271774001adc7d047010fc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 22 Dec 2022 13:22:57 +0100 Subject: [PATCH 245/249] Re-enable VMR build in installer's PRs (#15170) --- .vsts-ci.yml | 11 +++++------ src/SourceBuild/content/build.sh | 0 .../content/eng/install-nuget-credprovider.sh | 0 src/SourceBuild/content/prep.sh | 0 src/SourceBuild/content/prereqs/packages/archive/_ | 0 src/SourceBuild/content/prereqs/packages/prebuilt/_ | 0 6 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/SourceBuild/content/build.sh mode change 100644 => 100755 src/SourceBuild/content/eng/install-nuget-credprovider.sh mode change 100644 => 100755 src/SourceBuild/content/prep.sh create mode 100644 src/SourceBuild/content/prereqs/packages/archive/_ create mode 100644 src/SourceBuild/content/prereqs/packages/prebuilt/_ diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 89b59ca95..59526b0ca 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -373,12 +373,11 @@ stages: # the VMR synchronization step is run to validate that the PR can be merged and later # synchronized into the VMR without problems. # You can do this by allowing the Synchronize_VMR stage from above in PRs. -# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184) -# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: -# - template: eng/pipelines/templates/stages/vmr-build.yml -# parameters: -# vmrBranch: ${{ parameters.vmrBranch }} -# isBuiltFromVmr: false +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: eng/pipelines/templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + isBuiltFromVmr: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/eng/install-nuget-credprovider.sh b/src/SourceBuild/content/eng/install-nuget-credprovider.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/prereqs/packages/archive/_ b/src/SourceBuild/content/prereqs/packages/archive/_ new file mode 100644 index 000000000..e69de29bb diff --git a/src/SourceBuild/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/content/prereqs/packages/prebuilt/_ new file mode 100644 index 000000000..e69de29bb From 1c4be07c6ff156c7bcb2e5a34b7d3037deb6e52d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Dec 2022 16:41:20 +0000 Subject: [PATCH 246/249] [main] Update dependencies from dotnet/arcade-services (#15171) [main] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index be9acd85d..10f94ed35 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22620.1", + "version": "1.1.0-beta.22622.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f337e92d..f34d15914 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade-services - a15b2ccfd23a56ac9314ce91ea2d00f514b29856 + cf7f713e75aabd03322150abeba1d6223c14089d - + https://github.com/dotnet/arcade-services - a15b2ccfd23a56ac9314ce91ea2d00f514b29856 + cf7f713e75aabd03322150abeba1d6223c14089d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 41f5f60b3..7efbe1b2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22620.1 + 1.1.0-beta.22622.1 From ad40476d494462f445de21559b111d130b1261c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Jan 2023 14:10:27 +0000 Subject: [PATCH 247/249] Update dependencies from https://github.com/dotnet/arcade-services build 20230103.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.22622.1 -> To Version 1.1.0-beta.23053.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 10f94ed35..f77cfc433 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22622.1", + "version": "1.1.0-beta.23053.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f34d15914..71795b213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade cb37e1f67041bfc6484ec47525bda461606efe92 - + https://github.com/dotnet/arcade-services - cf7f713e75aabd03322150abeba1d6223c14089d + 11dfc0ff33280c18db03a2108673a41ade41fd55 - + https://github.com/dotnet/arcade-services - cf7f713e75aabd03322150abeba1d6223c14089d + 11dfc0ff33280c18db03a2108673a41ade41fd55 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7efbe1b2d..bc9ec2b98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22622.1 + 1.1.0-beta.23053.1 From c3d9814e7df735d1369cc27a0ea53fc48d1df7bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Jan 2023 22:18:31 +0000 Subject: [PATCH 248/249] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230103.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.22616.1 -> To Version 8.0.0-alpha.1.23053.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71795b213..68f953edd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -217,9 +217,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 31f422237eabbd5c89ecbd0f4a6f53e2c495422f + 9e4ae1f23e429bd64744dc71b202a5f1f4d822ce From 70205ded0cf7e5b1a45e8fe51dc2afc8050e44c0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 3 Jan 2023 17:34:39 -0500 Subject: [PATCH 249/249] When overriding RID for non-Linux, use $(Platform) not x64 (#15153) --- src/SourceBuild/content/repo-projects/aspnetcore.proj | 6 +++--- src/SourceBuild/content/repo-projects/installer.proj | 6 +++--- src/SourceBuild/content/repo-projects/runtime.proj | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index f20c61b71..afdd47c63 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -3,9 +3,9 @@ $(TargetRid) - osx-x64 - freebsd-x64 - win-x64 + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) $(StandardSourceBuildArgs.Replace('--publish', '')) diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 6dc870be9..42ef91233 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -7,9 +7,9 @@ $(TargetRid) - osx-x64 - freebsd-x64 - win-x64 + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 231c9b464..c477000a6 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -8,9 +8,9 @@ $(ProjectDirectory)/clean$(ShellExtension) $(TargetRid) - osx-x64 - freebsd-x64 - win-x64 + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-')) $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))