From 168cfd8f98a79408aa7e113aeb64f2eb3e432fb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 27 Oct 2021 16:39:26 -0700 Subject: [PATCH 001/239] Update to 6.0 in our wxl files as that was reverted a while back. --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index e6852b8ae..d86804624 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -76,7 +76,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET 5.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 856aafc38..4a925b0eb 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -76,7 +76,7 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud se chystáte používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. + Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 15fbe9b2d..65458680a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -76,7 +76,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> + Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index c83aeb2ad..f753407d7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -76,7 +76,7 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 3d46d4218..d82ea1088 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 5.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 + .NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 9da7b5290..117a46dce 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -76,7 +76,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. + Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index b56cc7d73..36f3a51ab 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -76,7 +76,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 619135d2d..5ff66fd5e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果打算结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index ded1d606a..490c9bee5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -76,7 +76,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. + Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. From e65b786dfd11b1e445529216321e5794b31d46fa Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 29 Oct 2021 16:05:17 -0700 Subject: [PATCH 002/239] Set ulimit --- run-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-build.sh b/run-build.sh index 7b98aedc0..99a408cf2 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,6 +25,9 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" +# Set max number of files open, helps avoid errors during NuGet restore +ulimit -n 16384 + args=( ) while [[ $# > 0 ]]; do From 9e6c445faf431f8b1bc2e183ad3aac9e33d8a1da Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 11:21:40 -0700 Subject: [PATCH 003/239] Run build under sudo so that we can set ulimit --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7ff647c40..5eb32b4c7 100755 --- a/build.sh +++ b/build.sh @@ -53,5 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - $DIR/run-build.sh $args + sudo $DIR/run-build.sh $args fi From be066386a23bd9c54c0ab8f23e06ef82621a32b9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Nov 2021 10:27:58 -0700 Subject: [PATCH 004/239] Update Versions.props --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1d77f37f..0cde85cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 6 0 1 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From fbf342ea55e8c5cd9cfcd7548172e265cfdfc111 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Nov 2021 10:31:01 -0700 Subject: [PATCH 005/239] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 15cc06f7c..89eddb755 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 21 - 12 + $([MSBuild]::Add($(VersionFeature), 21)) + $([MSBuild]::Add($(VersionFeature), 12)) From 082265dd3a159a8c098a0486a7822d91bacf7d2c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 2 Nov 2021 23:39:27 -0700 Subject: [PATCH 006/239] Bundle workload manifests as separate MSIs --- src/redist/targets/BundledManifests.targets | 115 ++++++------- src/redist/targets/GenerateMSIs.targets | 66 +++----- .../packaging/windows/clisdk/bundle.wxs | 5 +- .../windows/clisdk/generatebundle.ps1 | 7 +- .../windows/clisdk/generatemanifestsmsi.ps1 | 153 ------------------ 5 files changed, 78 insertions(+), 268 deletions(-) delete mode 100644 src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index db6c2c6e5..ee574e06a 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,84 +1,61 @@ - - - - - - - - + + + + + + + + - + + + + + $(Architecture) + - - [%(Version)] - - - - - - - - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + + %(Identity).Manifest-%(FeatureBand) + %(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests) + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + %(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi - + + + + [%(Version)] + - + + [%(Version)] + + + + + + + + + + + + - - - - - - - - - - - $(ArtifactsNonShippingPackagesDir)dotnet-sdkmanifests-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) - SDK_Manifests_$([MSBuild]::ValueOrDefault('$(Version)', '').Replace('-', '_')) - Microsoft .NET SDK Workload Manifests $(Version) - $(BaseOutputPath)$(Configuration)\sdk-manifests - - - - - - - - - - - - - - - - - - - diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index e0e948128..d17a563da 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -283,49 +283,36 @@ - - + - $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemanifestsmsi.ps1 + $(IntermediateOutputPath)WorkloadManifests.wxs + + + + + + + @(BundledManifests->' + + + ', ' + ') + + + +]]> + - - - - - - - - - - - + - - - - + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index d68bf8441..4cf3d5697 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -2,6 +2,7 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. param( + [Parameter(Mandatory=$true)][string]$WorkloadManifestWxsFile, [Parameter(Mandatory=$true)][string]$CLISDKMSIFile, [Parameter(Mandatory=$true)][string]$ASPNETRuntimeWixLibFile, [Parameter(Mandatory=$true)][string]$SharedFxMSIFile, @@ -18,7 +19,6 @@ param( [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$FinalizerExe, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, - [Parameter(Mandatory=$true)][string]$ManifestsMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, [Parameter(Mandatory=$true)][string]$WixRoot, [Parameter(Mandatory=$true)][string]$ProductMoniker, @@ -78,7 +78,7 @@ function RunCandleForBundle -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` -ext WixTagExtension.dll ` - "$AuthWsxRoot\bundle.wxs" + "$AuthWsxRoot\bundle.wxs" "$WorkloadManifestWxsFile" Write-Information "Candle output: $candleOutput" @@ -97,11 +97,14 @@ function RunLightForBundle $result = $true pushd "$WixRoot" + $WorkloadManifestWixobjFile = [System.IO.Path]::GetFileNameWithoutExtension($WorkloadManifestWxsFile) + ".wixobj" + Write-Information "Running light for bundle.." $lightOutput = .\light.exe -nologo ` -cultures:en-us ` bundle.wixobj ` + $WorkloadManifestWixobjFile ` $ASPNETRuntimeWixlibFile ` -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 deleted file mode 100644 index bef841dc2..000000000 --- a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$inputDir, - [Parameter(Mandatory=$true)][string]$DotnetMSIOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture -) - -$InstallFileswsx = ".\manifest-install-files.wxs" -$InstallFilesWixobj = "manifest-install-files.wixobj" - -function RunHeat -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running heat.." - - $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -ag ` - -var var.DotnetSrc ` - -cg InstallFiles ` - -srd ` - -dr DOTNETHOME ` - -out manifest-install-files.wxs - - Write-Information "Heat output: $heatOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Heat failed with exit code $LastExitCode." - } - - popd - Write-Information "RunHeat result: $result" - return $result -} - -function RunCandle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dUpgradeCode="$UpgradeCode" ` - -dDependencyKeyName="$DependencyKeyName" ` - -arch "$Architecture" ` - -ext WixDependencyExtension.dll ` - "$PSScriptRoot\manifests.wxs" ` - "$PSScriptRoot\provider.wxs" ` - "$PSScriptRoot\dotnethome_x64.wxs" ` - $InstallFileswsx - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLight -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running light.." - $CabCache = Join-Path $WixRoot "cabcache" - - $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` - -cultures:en-us ` - manifests.wixobj ` - provider.wixobj ` - dotnethome_x64.wixobj ` - $InstallFilesWixobj ` - -b "$inputDir" ` - -b "$PSScriptRoot" ` - -reusecab ` - -cc "$CabCache" ` - -out $DotnetMSIOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - -if(!(Test-Path $inputDir)) -{ - throw "$inputDir not found" -} - -Write-Information "Creating manifests MSI at $DotnetMSIOutput" - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -if(-Not (RunHeat)) -{ - Write-Information "Heat failed" - Exit -1 -} - -if(-Not (RunCandle)) -{ - Write-Information "Candle failed" - Exit -1 -} - -if(-Not (RunLight)) -{ - Write-Information "Light failed" - Exit -1 -} - -if(!(Test-Path $DotnetMSIOutput)) -{ - throw "Unable to create the manifests MSI." - Exit -1 -} - -Write-Information "Successfully created manifests MSI - $DotnetMSIOutput" - -exit $LastExitCode From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 3 Nov 2021 15:12:59 +0100 Subject: [PATCH 007/239] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. --- src/redist/targets/GetRuntimeInformation.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01f704c7d 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,6 +28,8 @@ '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostOSName)-$(Architecture) + dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) From 61774f69e89e2171718fcc7b5abfa3e6dc8bbd67 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 09:08:58 -0700 Subject: [PATCH 008/239] Stop generating manifest MSI VS Redist NuGet package Reverts 41ef6e2cac15af6411c96ab5f4f9d0bb67655695 --- src/redist/targets/GenerateMSIs.targets | 22 ------------------- .../VS.Redist.Common.NetCore.Manifest.nuspec | 18 --------------- 2 files changed, 40 deletions(-) delete mode 100644 src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index d17a563da..0a08326bf 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -38,9 +38,6 @@ $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg - - $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Manifest.$(Architecture).$(FullNugetVersion).nupkg $(ArtifactsDir)bin/SdkResolver/$(Configuration) $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec @@ -447,24 +444,6 @@ - - - - - - - - VS.Redist.Common.NetCore.Manifest.$ARCH$ - 1.0.0 - VS.Redist.Common.NetCore.Manifest.$ARCH$ - Microsoft - Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm - https://github.com/dotnet/core-sdk - true - .NET Core $MAJOR_MINOR$ SDK Manifests ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption - © Microsoft Corporation. All rights reserved. - - - - - From 69a868b025d3a2532a391ab87f19ef2d110e8e1a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 09:40:39 -0700 Subject: [PATCH 009/239] Only download workload manifest MSIs on Windows and not ARM --- src/redist/targets/BundledManifests.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index ee574e06a..1fa77028a 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -31,7 +31,9 @@ [%(Version)] - + + + [%(Version)] From 3217a5c4a3765b89cfea3a704fbe51e1a19b5575 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 09:41:43 -0700 Subject: [PATCH 010/239] Remove ALLOWMSIINSTALL property for workload manifest MSIs --- src/redist/targets/GenerateMSIs.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 0a08326bf..903332900 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -292,7 +292,6 @@ @(BundledManifests->' - ', ' ') From dc4a666b21c74380250c75c559cf48eb136085fb Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 29 Oct 2021 16:05:17 -0700 Subject: [PATCH 011/239] Set ulimit --- run-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-build.sh b/run-build.sh index 7b98aedc0..99a408cf2 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,6 +25,9 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" +# Set max number of files open, helps avoid errors during NuGet restore +ulimit -n 16384 + args=( ) while [[ $# > 0 ]]; do From 500bc39ef49d916bfeb4c18a337263f334ba99e5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 11:21:40 -0700 Subject: [PATCH 012/239] Run build under sudo so that we can set ulimit --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7ff647c40..5eb32b4c7 100755 --- a/build.sh +++ b/build.sh @@ -53,5 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - $DIR/run-build.sh $args + sudo $DIR/run-build.sh $args fi From 590cbca7eae32f5aa1a74d82300e498ab1092e59 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 10:35:42 -0700 Subject: [PATCH 013/239] Include workload manifests wixobj file --- src/redist/targets/GenerateMSIs.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 903332900..03a849533 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -360,6 +360,7 @@ -InformationAction Continue " /> + Date: Wed, 3 Nov 2021 14:34:41 -0700 Subject: [PATCH 014/239] Add comments about sudo and ulimit --- build.sh | 2 ++ run-build.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 5eb32b4c7..2115b2aeb 100755 --- a/build.sh +++ b/build.sh @@ -53,5 +53,7 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else + # Run under sudo so we can set ulimit + # See https://github.com/dotnet/core-eng/issues/14808 sudo $DIR/run-build.sh $args fi diff --git a/run-build.sh b/run-build.sh index 99a408cf2..fe839eb80 100755 --- a/run-build.sh +++ b/run-build.sh @@ -26,6 +26,7 @@ CUSTOM_BUILD_ARGS= [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" # Set max number of files open, helps avoid errors during NuGet restore +# See https://github.com/dotnet/core-eng/issues/14808 ulimit -n 16384 args=( ) From 2f331cfbc49da5bfadcc19ae4b213c2204fefc52 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 23:14:42 -0700 Subject: [PATCH 015/239] Verify that workload manifest MSIs are signed --- src/redist/targets/BundledManifests.targets | 34 ++++++++++++++++++++- src/redist/targets/GenerateMSIs.targets | 3 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 1fa77028a..89ccd630f 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -22,7 +22,7 @@ %(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests) $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) - %(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi + $([MSBuild]::NormalizePath('%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi')) @@ -37,8 +37,40 @@ [%(Version)] + + + + + + $(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe + $(ArtifactsLogDir)\workloadmanifestsigncheck.log + $(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log + + + + + + + + + + + + + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 03a849533..52652e642 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -280,7 +280,8 @@ - + $(IntermediateOutputPath)WorkloadManifests.wxs From 0336fa748eeca3757f091319e4c2579fa851c7ab Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa Date: Thu, 4 Nov 2021 15:47:36 +0100 Subject: [PATCH 016/239] Resolve Microsoft.Data.OData Component Governance alert --- src/core-sdk-tasks/AzurePublisher.cs | 9 ++++----- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/core-sdk-tasks/AzurePublisher.cs b/src/core-sdk-tasks/AzurePublisher.cs index c537331be..10d3691fa 100644 --- a/src/core-sdk-tasks/AzurePublisher.cs +++ b/src/core-sdk-tasks/AzurePublisher.cs @@ -7,12 +7,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Storage; -using Microsoft.WindowsAzure.Storage.Auth; -using Microsoft.WindowsAzure.Storage.Blob; +using Microsoft.Azure.Storage; +using Microsoft.Azure.Storage.Auth; +using Microsoft.Azure.Storage.Blob; namespace Microsoft.DotNet.Cli.Build { @@ -217,4 +216,4 @@ namespace Microsoft.DotNet.Cli.Build } } } -#endif \ No newline at end of file +#endif diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f4f54d8fb..1790b50e2 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -15,7 +15,7 @@ - + From 4b5642d215b3ee60634470d5776f0a488db2653d Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa Date: Fri, 5 Nov 2021 12:57:17 +0100 Subject: [PATCH 017/239] Change back to WindowsAzure.Storage and update the version to 9.3.3 --- src/core-sdk-tasks/AzurePublisher.cs | 6 +++--- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core-sdk-tasks/AzurePublisher.cs b/src/core-sdk-tasks/AzurePublisher.cs index 10d3691fa..243fad789 100644 --- a/src/core-sdk-tasks/AzurePublisher.cs +++ b/src/core-sdk-tasks/AzurePublisher.cs @@ -9,9 +9,9 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.Azure.Storage; -using Microsoft.Azure.Storage.Auth; -using Microsoft.Azure.Storage.Blob; +using Microsoft.WindowsAzure.Storage; +using Microsoft.WindowsAzure.Storage.Auth; +using Microsoft.WindowsAzure.Storage.Blob; namespace Microsoft.DotNet.Cli.Build { diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 1790b50e2..ba935fd37 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -15,7 +15,7 @@ - + From 86cb0ed124bfd93e23dad68685a3654b4ec97685 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 11:11:00 -0700 Subject: [PATCH 018/239] Update the release notes link. --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 4 ++-- .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index d86804624..dd1b836f6 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -61,7 +61,7 @@ 資源 • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs - • 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes + • 如需版本資訊，請前往 https://aka.ms/dotnet6-release-notes • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet6-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 4a925b0eb..893412976 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -61,7 +61,7 @@ Tento produkt shromažďuje data o využití. Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs - • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes + • Zpráva k vydání verze: https://aka.ms/dotnet6-release-notes • Kurzy: https://aka.ms/dotnet-tutorials Sada .NET SDK @@ -76,7 +76,7 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. + Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet6-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 65458680a..1524c80c0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -61,7 +61,7 @@ Dieses Produkt erfasst Nutzungsdaten. Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs - • Versionshinweise: https://aka.ms/dotnet5-release-notes + • Versionshinweise: https://aka.ms/dotnet6-release-notes • Tutorials: https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> + Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet6-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index f753407d7..daee64a00 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -61,7 +61,7 @@ Ce produit collecte des données d'utilisation Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs - • Notes de publication sur https://aka.ms/dotnet5-release-notes + • Notes de publication sur https://aka.ms/dotnet6-release-notes • Tutoriels sur https://aka.ms/dotnet-tutorials SDK .NET @@ -76,7 +76,7 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet6-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 099ba280e..c8322a175 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -61,7 +61,7 @@ Questo prodotto consente di raccogliere i dati sull'utilizzo Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs - • Note sulla versione https://aka.ms/dotnet5-release-notes + • Note sulla versione https://aka.ms/dotnet6-release-notes • Esercitazioni https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index d82ea1088..036f91f7d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -61,7 +61,7 @@ リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs - • リリース ノート https://aka.ms/dotnet5-release-notes + • リリース ノート https://aka.ms/dotnet6-release-notes • チュートリアル https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 + .NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet6-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index e6724467e..d0c8351c0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -61,7 +61,7 @@ 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs - • 릴리스 정보 https://aka.ms/dotnet5-release-notes + • 릴리스 정보 https://aka.ms/dotnet6-release-notes • 자습서 https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 5b64006d2..95954a100 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -61,7 +61,7 @@ Ten produkt gromadzi dane dotyczące użycia Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs - • Informacje o wersji: https://aka.ms/dotnet5-release-notes + • Informacje o wersji: https://aka.ms/dotnet6-release-notes • Samouczki: https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 117a46dce..f8c3da0a5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -61,7 +61,7 @@ Este produto coleta dados de uso Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/dotnet5-release-notes + • Notas sobre a Versão: https://aka.ms/dotnet6-release-notes • Tutoriais: https://aka.ms/dotnet-tutorials SDK do .NET @@ -76,7 +76,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. + Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet6-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 1d9a54fbc..afd31da3f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -61,7 +61,7 @@ Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs - • Заметки о выпуске: https://aka.ms/dotnet5-release-notes + • Заметки о выпуске: https://aka.ms/dotnet6-release-notes • Учебники: https://aka.ms/dotnet-tutorials Пакет SDK для .NET diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index 36f3a51ab..359ac186f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -61,7 +61,7 @@ Bu ürün, kullanım verilerini toplar Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs - • Sürüm Notları https://aka.ms/dotnet5-release-notes + • Sürüm Notları https://aka.ms/dotnet6-release-notes • Öğreticiler https://aka.ms/dotnet-tutorials .NET SDK'sı @@ -76,7 +76,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet6-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 5ff66fd5e..bf2209ebd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -61,7 +61,7 @@ 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs - • 发行说明: https://aka.ms/dotnet5-release-notes + • 发行说明: https://aka.ms/dotnet6-release-notes • 教程: https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet6-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index 490c9bee5..b65e2646c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -61,7 +61,7 @@ Este producto recopila datos de uso Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs - • Notas de la versión https://aka.ms/dotnet5-release-notes + • Notas de la versión https://aka.ms/dotnet6-release-notes • Tutoriales https://aka.ms/dotnet-tutorials SDK de .NET @@ -76,7 +76,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. + Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet6-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. From ec997a96d01e92cfe5b4c93f8b75e9b118142be2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 11:48:16 -0700 Subject: [PATCH 019/239] Enable localization of some wxs strings --- .../targets/packaging/windows/clisdk/LCID/1033/bundle.wxl | 3 +++ src/redist/targets/packaging/windows/clisdk/bundle.wxs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 436c5ef0a..a902989c0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -79,4 +79,7 @@ Resources If you plan to use .NET 6.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. <A HREF="https://aka.ms/dotnet6-release-notes">Learn more</A>. By clicking Install, you agree to the following terms: + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 926929aa6..ac6ccaeb9 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -10,16 +10,16 @@ AboutUrl="https://aka.ms/netcorehelp/" Compressed="yes"> - + WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine="$(var.NativeMachine_arm64)") OR DOTNETHOMESIMILARITYCHECKOVERRIDE From 161a9dcde22c222bcb18fbbd4fb45d59dcff6e45 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 15:11:40 -0700 Subject: [PATCH 020/239] Enable the DOTNET HOME mesage to be localizable. --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1040/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1042/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1045/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1049/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 3 +++ .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 3 +++ src/redist/targets/packaging/windows/clisdk/bundle.wxs | 6 +++--- 14 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index e6852b8ae..132e9795b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -79,4 +79,7 @@ 若預計要搭配 Visual Studio 使用 .NET 5.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 856aafc38..61ecde178 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -79,4 +79,7 @@ Zdroje informací Pokud se chystáte používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 15fbe9b2d..b882f677e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -79,4 +79,7 @@ Ressourcen Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index c83aeb2ad..24c0b9c81 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -79,4 +79,7 @@ Ressources Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 099ba280e..a71b4b852 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -79,4 +79,7 @@ Risorse Se si intende usare .NET 6.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. <A HREF="https://aka.ms/dotnet6-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 3d46d4218..e85f43044 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -79,4 +79,7 @@ .NET 5.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index e6724467e..ab6534617 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -79,4 +79,7 @@ Visual Studio와 함께 .NET 6.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. <A HREF="https://aka.ms/dotnet6-release-notes">자세한 정보</A>. [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 5b64006d2..e6e058524 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -79,4 +79,7 @@ Zasoby Jeśli planujesz używać platformy .NET 6.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. <A HREF="https://aka.ms/dotnet6-release-notes">Dowiedz się więcej</A>. Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 9da7b5290..c55a284f9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -79,4 +79,7 @@ Recursos Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 1d9a54fbc..f899aec4a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -79,4 +79,7 @@ Если вы планируете использовать .NET 6.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. <A HREF="https://aka.ms/dotnet6-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index b56cc7d73..e6c201329 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -79,4 +79,7 @@ Kaynaklar Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 619135d2d..0de6235d5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -79,4 +79,7 @@ 如果打算结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index ded1d606a..f775afe30 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -79,4 +79,7 @@ Recursos Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. + The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" + The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index ac6ccaeb9..607f4517d 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -10,16 +10,16 @@ AboutUrl="https://aka.ms/netcorehelp/" Compressed="yes"> - + WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine="$(var.NativeMachine_arm64)") OR DOTNETHOMESIMILARITYCHECKOVERRIDE From 87623854173ba7ec27e32ff35640e40dbe922956 Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa Date: Mon, 8 Nov 2021 10:41:56 +0100 Subject: [PATCH 021/239] include System.Net.Http version 4.3.4 --- src/core-sdk-tasks/core-sdk-tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index ba935fd37..5ad1f11af 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -16,6 +16,7 @@ + From e856a47d99d772bef1f496b142ff7ae05056831d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 10 Nov 2021 10:11:02 -0600 Subject: [PATCH 022/239] Revert "Enable public tarball CI" (#12629) This reverts commit ec426f0634687e3ebb1aba197bd795c1bf65277e. --- eng/source-build-tarball-build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 036c285f7..2c7a9ae59 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -3,11 +3,8 @@ pr: none resources: pipelines: - pipeline: installer-build-resource - ${{ if eq(variables['System.TeamProject'], 'public') }}: - source: installer - ${{ if ne(variables['System.TeamProject'], 'public') }}: - source: dotnet-installer-official-ci - trigger: true # Run pipeline when any run of installer CI completes + source: dotnet-installer-official-ci + trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes stages: - stage: build From 5a3e064b8859bb162375e77c23d66d10379a454c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Nov 2021 10:48:36 -0800 Subject: [PATCH 023/239] [release/6.0.1xx] update Asp.Net templates (#12597) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0cde85cd3..b0eda23fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.11 + 5.0.12 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.20 + 3.1.21 3.2.1 4.8.0-rc2.19462.10 From 3a49af80627ea59ef7974ece94f38690366d0bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:49:57 +0000 Subject: [PATCH 024/239] Update dependencies from https://github.com/dotnet/arcade build 20211108.5 (#12630) [release/6.0.1xx] Update dependencies from dotnet/arcade --- NuGet.config | 22 ------------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 4 ++-- 8 files changed, 14 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index de42f9ad5..b995dca0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685..99237e507 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b0eda23fd..d29adc000 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21519.3 + 6.0.0-beta.21558.5 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849..4882dd931 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -62,7 +62,7 @@ jobs: pool: # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 + vmImage: windows-2019 ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: vmImage: windows-2019 steps: diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2e..2b55a567f 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4..d8990549e 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96..90015a7e5 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index 4f5a20ba8..4e1426906 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5" } } From 2747a16e30c5c3a70762ef9f1a977a880137035a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Nov 2021 14:45:09 -0800 Subject: [PATCH 025/239] [release/6.0.2xx] update Asp.Net templates (#12598) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b6a478c8..7e8888edf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.11 + 5.0.12 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.20 + 3.1.21 3.2.1 4.8.0-rc2.19462.10 From c0af1d694a5dc477531aa4b808459d7764c8d7e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 23:05:56 +0000 Subject: [PATCH 026/239] Update dependencies from https://github.com/dotnet/arcade build 20211110.2 (#12633) [release/6.0.1xx] Update dependencies from dotnet/arcade --- 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 99237e507..5711c22d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d29adc000..7c1e724fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21558.5 + 6.0.0-beta.21560.2 diff --git a/global.json b/global.json index 4e1426906..b785d4545 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" } } From 7667cec39ead40fc45b31349d794d99d70acac75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 23:16:51 +0000 Subject: [PATCH 027/239] [release/6.0.2xx] Update dependencies from dotnet/arcade (#12631) [release/6.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 22 ------------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 6 ++--- 8 files changed, 15 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index de42f9ad5..b995dca0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685..5711c22d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7e8888edf..18ed2689e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21519.3 + 6.0.0-beta.21560.2 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849..4882dd931 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -62,7 +62,7 @@ jobs: pool: # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 + vmImage: windows-2019 ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: vmImage: windows-2019 steps: diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2e..2b55a567f 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4..d8990549e 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96..90015a7e5 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index 4f5a20ba8..b785d4545 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" } } From 28afaeb89a04eb9c82588a3fc4ee743a0f92a0d2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 10 Nov 2021 18:14:49 -0600 Subject: [PATCH 028/239] Flow environment variable into run-build (#12637) --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4dfcc58ed..594a355fa 100755 --- a/build.sh +++ b/build.sh @@ -55,5 +55,5 @@ if [ ! -z "$BUILD_IN_DOCKER" ]; then else # Run under sudo so we can set ulimit # See https://github.com/dotnet/core-eng/issues/14808 - sudo $DIR/run-build.sh $args + sudo -E $DIR/run-build.sh $args fi From 84217d6e27612436f1f64bcede354549afd4d495 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 11 Nov 2021 08:22:24 -0600 Subject: [PATCH 029/239] Specify depth when updating submodules (#12588) --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index cb1a5adfe..75fd838e8 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -170,7 +170,7 @@ Condition="$(IsRootRepo) != 'true'" /> From 9afbd7fef892bd3b4a18c7a140e914f52b68c5cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:46:25 +0000 Subject: [PATCH 030/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12638) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21521.1 -> To Version 6.0.0-alpha.1.21561.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 5711c22d8..53cb1f886 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 897a9709eb370a92bce2391d77b03d06149cbb6c From 0527f050188743e0a5d3da602391208323b7a291 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 11 Nov 2021 13:16:59 -0600 Subject: [PATCH 031/239] dotnet/runtime: Enable source-link in source-build for '.version' file (#12527) --- ...nk-in-source-build-for-.version-file.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch new file mode 100644 index 000000000..bec3c2a3f --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 26 Oct 2021 15:41:57 -0500 +Subject: [PATCH] Enable source-link in source-build for '.version' file + +See https://github.com/dotnet/source-build/issues/2569 +--- + eng/SourceBuild.props | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index bba40f534e5..b70f668a15b 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -23,14 +23,6 @@ + minimal + + +- +- +- +- +- +- +- +- + + From 9056116cb32133d97101a5cc8fcf7483dadc91ac Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 12 Nov 2021 09:31:38 -0600 Subject: [PATCH 032/239] Increase source-build tarball build timeout (#12652) --- .../eng/common/templates/job/source-build-run-tarball-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 138e0c7db..18bb80b22 100644 --- 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 @@ -30,7 +30,7 @@ jobs: Fedora33-Offline: _runOnline: false _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - timeoutInMinutes: 210 + timeoutInMinutes: 240 variables: _TarballDir: $(Build.StagingDirectory)/tarball _BuildConfig: Release From 772d572a31b502772518a35580818c37d197e6bd Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 12 Nov 2021 09:36:27 -0600 Subject: [PATCH 033/239] dotnet/runtime: Disable package validation in source-build for reliability (#12526) --- ...validation-in-source-build-for-relia.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch new file mode 100644 index 000000000..161b962b7 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 26 Oct 2021 13:24:57 -0500 +Subject: [PATCH] Disable package validation in source-build for reliability + +See comment in diff. + +Upstream PR: https://github.com/dotnet/runtime/pull/60881 +--- + eng/packaging.targets | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/eng/packaging.targets b/eng/packaging.targets +index ecf74672ac8..0a04191182d 100644 +--- a/eng/packaging.targets ++++ b/eng/packaging.targets +@@ -1,7 +1,13 @@ + + + +- true ++ ++ true + + true + $([MSBuild]::Subtract($(MajorVersion), 1)).0.0 From 457210a04c1900ee630e2a7b852f680a952eb71d Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 12 Nov 2021 14:35:39 -0500 Subject: [PATCH 034/239] Also publish non-portable RID runtime symbols tarball (#12622) This fixes a regression in .NET 6 source-build compared to the .NET 5 source-build. source-build wants to publish runtime symbols tarball for portable (eg, linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build. Following .NET 5 conventions, I expected to see: ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz Unfortunately, only the portable RID (linux-x64) tarball is present after a full source-build in .NET 6. It turns out this is a bug in our build scripts. We try and copy binaries - including the symbol tarballs - after building each of runtime-portable and runtime. However, the target dependency is wrong: after `Build`, the intermediate package doesn't exist from the just-built repo. What ends up happening is that nothing is copied after building runtime-portable. However, after building runtime, the runtime-portable intermediate artifacts are found and copied over. So the end build has portable RID symbos, but not the non-portable ones. Fix that by changing the dependency of this target so it runs after intermediate packages are available. --- src/SourceBuild/tarball/content/repos/runtime.common.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets index ca606b23d..862b70dc8 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.targets +++ b/src/SourceBuild/tarball/content/repos/runtime.common.targets @@ -23,7 +23,7 @@ From 76d625236e1f69f6fe11e35eb0a7bcf6a7332c33 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 12 Nov 2021 13:47:56 -0600 Subject: [PATCH 035/239] Allow SDK to produce reference assemblies (#12549) --- src/SourceBuild/tarball/content/repos/sdk.proj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 22f91b0eb..9a26cd695 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -10,11 +10,6 @@ true $(BuildCommandArgs) -v $(LogVerbosity) - - $(BuildCommandArgs) /p:ProduceReferenceAssembly=false - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) From 4499a10e37c8e6f93a81d703767514f8b5b8a613 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 12 Nov 2021 13:01:55 -0800 Subject: [PATCH 036/239] Update download table --- README.md | 110 +++++++++++++++--- .../TableGenerator.Tests.fsproj | 2 +- .../TableGenerator/Program.fs | 3 + .../TableGenerator/TableGenerator.fsproj | 2 +- 4 files changed, 99 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0568e4548..fa2dc039b 100644 --- a/README.md +++ b/README.md @@ -127,21 +127,21 @@ We strongly recommend using `--skip-manifest-update` with `dotnet workload insta 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. -| Platform | main
(7.0.x Runtime) | Release/6.0.1XX
(6.0.x Runtime) | Release/5.0.4XX
(5.0 Runtime) | Release/5.0.2XX
(5.0 Runtime) | Release/3.1.4XX
(3.1.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-6.0.1XX]][win-x64-version-6.0.1XX]
[Installer][win-x64-installer-6.0.1XX] - [Checksum][win-x64-installer-checksum-6.0.1XX]
[zip][win-x64-zip-6.0.1XX] - [Checksum][win-x64-zip-checksum-6.0.1XX] | [![][win-x64-badge-5.0.4XX]][win-x64-version-5.0.4XX]
[Installer][win-x64-installer-5.0.4XX] - [Checksum][win-x64-installer-checksum-5.0.4XX]
[zip][win-x64-zip-5.0.4XX] - [Checksum][win-x64-zip-checksum-5.0.4XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]
[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]
[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]
[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]
[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] | -| **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-6.0.1XX]][win-x86-version-6.0.1XX]
[Installer][win-x86-installer-6.0.1XX] - [Checksum][win-x86-installer-checksum-6.0.1XX]
[zip][win-x86-zip-6.0.1XX] - [Checksum][win-x86-zip-checksum-6.0.1XX] | [![][win-x86-badge-5.0.4XX]][win-x86-version-5.0.4XX]
[Installer][win-x86-installer-5.0.4XX] - [Checksum][win-x86-installer-checksum-5.0.4XX]
[zip][win-x86-zip-5.0.4XX] - [Checksum][win-x86-zip-checksum-5.0.4XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]
[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]
[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | -| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]
[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] | -| **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-6.0.1XX]][win-arm64-version-6.0.1XX]
[Installer][win-arm64-installer-6.0.1XX] - [Checksum][win-arm64-installer-checksum-6.0.1XX]
[zip][win-arm64-zip-6.0.1XX] | [![][win-arm64-badge-5.0.4XX]][win-arm64-version-5.0.4XX]
[Installer][win-arm64-installer-5.0.4XX] - [Checksum][win-arm64-installer-checksum-5.0.4XX]
[zip][win-arm64-zip-5.0.4XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]
[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]
[zip][win-arm64-zip-5.0.2XX] | **N/A** | -| **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-6.0.1XX]][osx-x64-version-6.0.1XX]
[Installer][osx-x64-installer-6.0.1XX] - [Checksum][osx-x64-installer-checksum-6.0.1XX]
[tar.gz][osx-x64-targz-6.0.1XX] - [Checksum][osx-x64-targz-checksum-6.0.1XX] | [![][osx-x64-badge-5.0.4XX]][osx-x64-version-5.0.4XX]
[Installer][osx-x64-installer-5.0.4XX] - [Checksum][osx-x64-installer-checksum-5.0.4XX]
[tar.gz][osx-x64-targz-5.0.4XX] - [Checksum][osx-x64-targz-checksum-5.0.4XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | -| **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-6.0.1XX]][osx-arm64-version-6.0.1XX]
[Installer][osx-arm64-installer-6.0.1XX] - [Checksum][osx-arm64-installer-checksum-6.0.1XX]
[tar.gz][osx-arm64-targz-6.0.1XX] - [Checksum][osx-arm64-targz-checksum-6.0.1XX] | **N/A** | **N/A** | **N/A** | -| **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-6.0.1XX]][linux-version-6.0.1XX]
[DEB Installer][linux-DEB-installer-6.0.1XX] - [Checksum][linux-DEB-installer-checksum-6.0.1XX]
[RPM Installer][linux-RPM-installer-6.0.1XX] - [Checksum][linux-RPM-installer-checksum-6.0.1XX]
_see installer note below_1
[tar.gz][linux-targz-6.0.1XX] - [Checksum][linux-targz-checksum-6.0.1XX] | [![][linux-badge-5.0.4XX]][linux-version-5.0.4XX]
[DEB Installer][linux-DEB-installer-5.0.4XX] - [Checksum][linux-DEB-installer-checksum-5.0.4XX]
[RPM Installer][linux-RPM-installer-5.0.4XX] - [Checksum][linux-RPM-installer-checksum-5.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.4XX] - [Checksum][linux-targz-checksum-5.0.4XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]
[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]
[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | -| **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-6.0.1XX]][linux-arm-version-6.0.1XX]
[tar.gz][linux-arm-targz-6.0.1XX] - [Checksum][linux-arm-targz-checksum-6.0.1XX] | [![][linux-arm-badge-5.0.4XX]][linux-arm-version-5.0.4XX]
[tar.gz][linux-arm-targz-5.0.4XX] - [Checksum][linux-arm-targz-checksum-5.0.4XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | -| **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-6.0.1XX]][linux-arm64-version-6.0.1XX]
[tar.gz][linux-arm64-targz-6.0.1XX] - [Checksum][linux-arm64-targz-checksum-6.0.1XX] | [![][linux-arm64-badge-5.0.4XX]][linux-arm64-version-5.0.4XX]
[tar.gz][linux-arm64-targz-5.0.4XX] - [Checksum][linux-arm64-targz-checksum-5.0.4XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | -| **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-6.0.1XX]][linux-musl-x64-version-6.0.1XX]
[tar.gz][linux-musl-x64-targz-6.0.1XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX] | [![][linux-musl-x64-badge-5.0.4XX]][linux-musl-x64-version-5.0.4XX]
[tar.gz][linux-musl-x64-targz-5.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.4XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | -| **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-6.0.1XX]][linux-musl-arm-version-6.0.1XX]
[tar.gz][linux-musl-arm-targz-6.0.1XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX] | [![][linux-musl-arm-badge-5.0.4XX]][linux-musl-arm-version-5.0.4XX]
[tar.gz][linux-musl-arm-targz-5.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.4XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | -| **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-6.0.1XX]][linux-musl-arm64-version-6.0.1XX]
[tar.gz][linux-musl-arm64-targz-6.0.1XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX] | [![][linux-musl-arm64-badge-5.0.4XX]][linux-musl-arm64-version-5.0.4XX]
[tar.gz][linux-musl-arm64-targz-5.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.4XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | -| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | +| Platform | main
(7.0.x Runtime) | Release/6.0.2XX
(6.0.x Runtime) | Release/6.0.1XX
(6.0.x Runtime) | Release/5.0.4XX
(5.0 Runtime) | Release/5.0.2XX
(5.0 Runtime) | Release/3.1.4XX
(3.1.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-6.0.2XX]][win-x64-version-6.0.2XX]
[Installer][win-x64-installer-6.0.2XX] - [Checksum][win-x64-installer-checksum-6.0.2XX]
[zip][win-x64-zip-6.0.2XX] - [Checksum][win-x64-zip-checksum-6.0.2XX] | [![][win-x64-badge-6.0.1XX]][win-x64-version-6.0.1XX]
[Installer][win-x64-installer-6.0.1XX] - [Checksum][win-x64-installer-checksum-6.0.1XX]
[zip][win-x64-zip-6.0.1XX] - [Checksum][win-x64-zip-checksum-6.0.1XX] | [![][win-x64-badge-5.0.4XX]][win-x64-version-5.0.4XX]
[Installer][win-x64-installer-5.0.4XX] - [Checksum][win-x64-installer-checksum-5.0.4XX]
[zip][win-x64-zip-5.0.4XX] - [Checksum][win-x64-zip-checksum-5.0.4XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]
[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]
[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]
[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]
[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] | +| **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-6.0.2XX]][win-x86-version-6.0.2XX]
[Installer][win-x86-installer-6.0.2XX] - [Checksum][win-x86-installer-checksum-6.0.2XX]
[zip][win-x86-zip-6.0.2XX] - [Checksum][win-x86-zip-checksum-6.0.2XX] | [![][win-x86-badge-6.0.1XX]][win-x86-version-6.0.1XX]
[Installer][win-x86-installer-6.0.1XX] - [Checksum][win-x86-installer-checksum-6.0.1XX]
[zip][win-x86-zip-6.0.1XX] - [Checksum][win-x86-zip-checksum-6.0.1XX] | [![][win-x86-badge-5.0.4XX]][win-x86-version-5.0.4XX]
[Installer][win-x86-installer-5.0.4XX] - [Checksum][win-x86-installer-checksum-5.0.4XX]
[zip][win-x86-zip-5.0.4XX] - [Checksum][win-x86-zip-checksum-5.0.4XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]
[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]
[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | +| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]
[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] | +| **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-6.0.2XX]][win-arm64-version-6.0.2XX]
[Installer][win-arm64-installer-6.0.2XX] - [Checksum][win-arm64-installer-checksum-6.0.2XX]
[zip][win-arm64-zip-6.0.2XX] | [![][win-arm64-badge-6.0.1XX]][win-arm64-version-6.0.1XX]
[Installer][win-arm64-installer-6.0.1XX] - [Checksum][win-arm64-installer-checksum-6.0.1XX]
[zip][win-arm64-zip-6.0.1XX] | [![][win-arm64-badge-5.0.4XX]][win-arm64-version-5.0.4XX]
[Installer][win-arm64-installer-5.0.4XX] - [Checksum][win-arm64-installer-checksum-5.0.4XX]
[zip][win-arm64-zip-5.0.4XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]
[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]
[zip][win-arm64-zip-5.0.2XX] | **N/A** | +| **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-6.0.2XX]][osx-x64-version-6.0.2XX]
[Installer][osx-x64-installer-6.0.2XX] - [Checksum][osx-x64-installer-checksum-6.0.2XX]
[tar.gz][osx-x64-targz-6.0.2XX] - [Checksum][osx-x64-targz-checksum-6.0.2XX] | [![][osx-x64-badge-6.0.1XX]][osx-x64-version-6.0.1XX]
[Installer][osx-x64-installer-6.0.1XX] - [Checksum][osx-x64-installer-checksum-6.0.1XX]
[tar.gz][osx-x64-targz-6.0.1XX] - [Checksum][osx-x64-targz-checksum-6.0.1XX] | [![][osx-x64-badge-5.0.4XX]][osx-x64-version-5.0.4XX]
[Installer][osx-x64-installer-5.0.4XX] - [Checksum][osx-x64-installer-checksum-5.0.4XX]
[tar.gz][osx-x64-targz-5.0.4XX] - [Checksum][osx-x64-targz-checksum-5.0.4XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | +| **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-6.0.2XX]][osx-arm64-version-6.0.2XX]
[Installer][osx-arm64-installer-6.0.2XX] - [Checksum][osx-arm64-installer-checksum-6.0.2XX]
[tar.gz][osx-arm64-targz-6.0.2XX] - [Checksum][osx-arm64-targz-checksum-6.0.2XX] | [![][osx-arm64-badge-6.0.1XX]][osx-arm64-version-6.0.1XX]
[Installer][osx-arm64-installer-6.0.1XX] - [Checksum][osx-arm64-installer-checksum-6.0.1XX]
[tar.gz][osx-arm64-targz-6.0.1XX] - [Checksum][osx-arm64-targz-checksum-6.0.1XX] | **N/A** | **N/A** | **N/A** | +| **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-6.0.2XX]][linux-version-6.0.2XX]
[DEB Installer][linux-DEB-installer-6.0.2XX] - [Checksum][linux-DEB-installer-checksum-6.0.2XX]
[RPM Installer][linux-RPM-installer-6.0.2XX] - [Checksum][linux-RPM-installer-checksum-6.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-6.0.2XX] - [Checksum][linux-targz-checksum-6.0.2XX] | [![][linux-badge-6.0.1XX]][linux-version-6.0.1XX]
[DEB Installer][linux-DEB-installer-6.0.1XX] - [Checksum][linux-DEB-installer-checksum-6.0.1XX]
[RPM Installer][linux-RPM-installer-6.0.1XX] - [Checksum][linux-RPM-installer-checksum-6.0.1XX]
_see installer note below_1
[tar.gz][linux-targz-6.0.1XX] - [Checksum][linux-targz-checksum-6.0.1XX] | [![][linux-badge-5.0.4XX]][linux-version-5.0.4XX]
[DEB Installer][linux-DEB-installer-5.0.4XX] - [Checksum][linux-DEB-installer-checksum-5.0.4XX]
[RPM Installer][linux-RPM-installer-5.0.4XX] - [Checksum][linux-RPM-installer-checksum-5.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.4XX] - [Checksum][linux-targz-checksum-5.0.4XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]
[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]
[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | +| **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-6.0.2XX]][linux-arm-version-6.0.2XX]
[tar.gz][linux-arm-targz-6.0.2XX] - [Checksum][linux-arm-targz-checksum-6.0.2XX] | [![][linux-arm-badge-6.0.1XX]][linux-arm-version-6.0.1XX]
[tar.gz][linux-arm-targz-6.0.1XX] - [Checksum][linux-arm-targz-checksum-6.0.1XX] | [![][linux-arm-badge-5.0.4XX]][linux-arm-version-5.0.4XX]
[tar.gz][linux-arm-targz-5.0.4XX] - [Checksum][linux-arm-targz-checksum-5.0.4XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | +| **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-6.0.2XX]][linux-arm64-version-6.0.2XX]
[tar.gz][linux-arm64-targz-6.0.2XX] - [Checksum][linux-arm64-targz-checksum-6.0.2XX] | [![][linux-arm64-badge-6.0.1XX]][linux-arm64-version-6.0.1XX]
[tar.gz][linux-arm64-targz-6.0.1XX] - [Checksum][linux-arm64-targz-checksum-6.0.1XX] | [![][linux-arm64-badge-5.0.4XX]][linux-arm64-version-5.0.4XX]
[tar.gz][linux-arm64-targz-5.0.4XX] - [Checksum][linux-arm64-targz-checksum-5.0.4XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | +| **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-6.0.2XX]][linux-musl-x64-version-6.0.2XX]
[tar.gz][linux-musl-x64-targz-6.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.2XX] | [![][linux-musl-x64-badge-6.0.1XX]][linux-musl-x64-version-6.0.1XX]
[tar.gz][linux-musl-x64-targz-6.0.1XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX] | [![][linux-musl-x64-badge-5.0.4XX]][linux-musl-x64-version-5.0.4XX]
[tar.gz][linux-musl-x64-targz-5.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.4XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | +| **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-6.0.2XX]][linux-musl-arm-version-6.0.2XX]
[tar.gz][linux-musl-arm-targz-6.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.2XX] | [![][linux-musl-arm-badge-6.0.1XX]][linux-musl-arm-version-6.0.1XX]
[tar.gz][linux-musl-arm-targz-6.0.1XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX] | [![][linux-musl-arm-badge-5.0.4XX]][linux-musl-arm-version-5.0.4XX]
[tar.gz][linux-musl-arm-targz-5.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.4XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | +| **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-6.0.2XX]][linux-musl-arm64-version-6.0.2XX]
[tar.gz][linux-musl-arm64-targz-6.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.2XX] | [![][linux-musl-arm64-badge-6.0.1XX]][linux-musl-arm64-version-6.0.1XX]
[tar.gz][linux-musl-arm64-targz-6.0.1XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX] | [![][linux-musl-arm64-badge-5.0.4XX]][linux-musl-arm64-version-5.0.4XX]
[tar.gz][linux-musl-arm64-targz-5.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.4XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | +| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | 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: @@ -157,6 +157,13 @@ Reference notes: [win-x64-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip.sha +[win-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_x64_Release_version_badge.svg +[win-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-x64.txt +[win-x64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.exe +[win-x64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.exe.sha +[win-x64-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.zip +[win-x64-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.zip.sha + [win-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_x64_Release_version_badge.svg [win-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-x64.txt [win-x64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-x64.exe @@ -192,6 +199,13 @@ Reference notes: [win-x86-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip.sha +[win-x86-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_x86_Release_version_badge.svg +[win-x86-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-x86.txt +[win-x86-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.exe +[win-x86-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.exe.sha +[win-x86-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.zip +[win-x86-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.zip.sha + [win-x86-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_x86_Release_version_badge.svg [win-x86-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-x86.txt [win-x86-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-x86.exe @@ -227,6 +241,13 @@ Reference notes: [osx-x64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha +[osx-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/osx_x64_Release_version_badge.svg +[osx-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-osx-x64.txt +[osx-x64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg +[osx-x64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg.sha +[osx-x64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.tar.gz +[osx-x64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha + [osx-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/osx_x64_Release_version_badge.svg [osx-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-osx-x64.txt [osx-x64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-osx-x64.pkg @@ -262,6 +283,13 @@ Reference notes: [osx-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha +[osx-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/osx_arm64_Release_version_badge.svg +[osx-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-osx-arm64.txt +[osx-arm64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg +[osx-arm64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg.sha +[osx-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.tar.gz +[osx-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha + [osx-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/osx_arm64_Release_version_badge.svg [osx-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-osx-arm64.txt [osx-arm64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-osx-arm64.pkg @@ -278,6 +306,15 @@ Reference notes: [linux-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha +[linux-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_x64_Release_version_badge.svg +[linux-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-x64.txt +[linux-DEB-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.deb +[linux-DEB-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.deb.sha +[linux-RPM-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.rpm +[linux-RPM-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.rpm.sha +[linux-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz +[linux-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz.sha + [linux-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_x64_Release_version_badge.svg [linux-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-x64.txt [linux-DEB-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-x64.deb @@ -319,6 +356,11 @@ Reference notes: [linux-arm-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha +[linux-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_arm_Release_version_badge.svg +[linux-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-arm.txt +[linux-arm-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz +[linux-arm-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz.sha + [linux-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_arm_Release_version_badge.svg [linux-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-arm.txt [linux-arm-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz @@ -344,6 +386,11 @@ Reference notes: [linux-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha +[linux-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_arm64_Release_version_badge.svg +[linux-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-arm64.txt +[linux-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz +[linux-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha + [linux-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_arm64_Release_version_badge.svg [linux-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-arm64.txt [linux-arm64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz @@ -369,6 +416,11 @@ Reference notes: [rhel-6-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha +[rhel-6-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/rhel.6_x64_Release_version_badge.svg +[rhel-6-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-rhel.6-x64.txt +[rhel-6-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha + [rhel-6-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/rhel.6_x64_Release_version_badge.svg [rhel-6-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-rhel.6-x64.txt [rhel-6-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz @@ -394,6 +446,11 @@ Reference notes: [linux-musl-x64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha +[linux-musl-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_x64_Release_version_badge.svg +[linux-musl-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-x64.txt +[linux-musl-x64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz +[linux-musl-x64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha + [linux-musl-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_x64_Release_version_badge.svg [linux-musl-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-x64.txt [linux-musl-x64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz @@ -419,6 +476,11 @@ Reference notes: [linux-musl-arm-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_arm_Release_version_badge.svg +[linux-musl-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha + [linux-musl-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_arm_Release_version_badge.svg [linux-musl-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-arm.txt [linux-musl-arm-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz @@ -439,6 +501,11 @@ Reference notes: [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_arm64_Release_version_badge.svg +[linux-musl-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha + [linux-musl-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_arm64_Release_version_badge.svg [linux-musl-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-arm64.txt [linux-musl-arm64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz @@ -459,6 +526,11 @@ Reference notes: [win-arm-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip.sha +[win-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_arm_Release_version_badge.svg +[win-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-arm.txt +[win-arm-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm.zip +[win-arm-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm.zip.sha + [win-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_arm_Release_version_badge.svg [win-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-arm.txt [win-arm-zip-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-arm.zip @@ -486,6 +558,13 @@ Reference notes: [win-arm64-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha +[win-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_arm64_Release_version_badge.svg +[win-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-arm64.txt +[win-arm64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.exe +[win-arm64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.exe.sha +[win-arm64-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.zip +[win-arm64-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.zip.sha + [win-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_arm64_Release_version_badge.svg [win-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-arm64.txt [win-arm64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-arm64.exe @@ -509,7 +588,6 @@ Reference notes: [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.Tests/TableGenerator.Tests.fsproj b/tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj index f33878f9b..fc35c3646 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 @@  - netcoreapp3.1 + netcoreapp6.0 diff --git a/tools/sdk-readme-table-generator/TableGenerator/Program.fs b/tools/sdk-readme-table-generator/TableGenerator/Program.fs index f7437c8aa..119652b63 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Program.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Program.fs @@ -9,6 +9,9 @@ let inputBranches = [ { GitBranchName = "main" DisplayName = "main
(7.0.x Runtime)" AkaMsChannel = Some("7.0.1xx/daily") } + { GitBranchName = "release/6.0.2xx" + DisplayName = "Release/6.0.2XX
(6.0.x Runtime)" + AkaMsChannel = Some("6.0.2xx/daily") } { GitBranchName = "release/6.0.1xx" DisplayName = "Release/6.0.1XX
(6.0.x Runtime)" AkaMsChannel = Some("6.0.1xx/daily") } diff --git a/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj b/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj index 875b6cfcb..d64c91c15 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj +++ b/tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + netcoreapp6.0 From fb42fb7282657762abeed5d661d8094af359a1d5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Nov 2021 13:47:22 -0800 Subject: [PATCH 037/239] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 89eddb755..e7779dd08 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -191,8 +191,8 @@ - - + + diff --git a/eng/Versions.props b/eng/Versions.props index 29f5a13eb..ccc3c58a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21561.9 - 7.0.0-alpha.1.21561.9 - 7.0.0-alpha.1.21561.9 - 7.0.0-alpha.1.21561.9 - 7.0.0-alpha.1.21561.9 - 7.0.0-alpha.1.21561.9 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 0.2.0 - 7.0.100-alpha.1.21562.5 - 7.0.100-alpha.1.21562.5 + 7.0.100-alpha.1.21562.7 + 7.0.100-alpha.1.21562.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe037abe8b2f3f2b6b5d84879b8d37fbc31543ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Nov 2021 23:50:59 +0000 Subject: [PATCH 039/239] Update dependencies from https://github.com/dotnet/sdk build 20211112.9 (#12659) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211109-03 to 17.1.0-preview-20211112-03 (parent: Microsoft.NET.Sdk) --- 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 5477b5077..7b228108f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 7669cc78ac5d15ad0ee5b68e65d7d6f753fe918b - + https://github.com/dotnet/sdk - 1762a9402707da835fa5813ca8d0b09490b5e4f3 + 8c81f32aafb7b46678444f5354bc73dcde75a664 - + https://github.com/dotnet/sdk - 1762a9402707da835fa5813ca8d0b09490b5e4f3 + 8c81f32aafb7b46678444f5354bc73dcde75a664 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 1dc3ba2e137b3cdaada4edfb41210b2b0237c428 + c80070733b5dfd08459274189082806358b16daa diff --git a/eng/Versions.props b/eng/Versions.props index ccc3c58a5..cc5df9fb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21562.7 - 7.0.100-alpha.1.21562.7 + 7.0.100-alpha.1.21562.9 + 7.0.100-alpha.1.21562.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211109-03 + 17.1.0-preview-20211112-03 From c0c7a2d301aa3bd1367a85b86add2083fa053588 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 12 Nov 2021 17:59:52 -0600 Subject: [PATCH 040/239] Support tarball builds in public CI (#12658) --- eng/source-build-tarball-build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 2c7a9ae59..ec870c319 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -2,13 +2,19 @@ trigger: none pr: none resources: pipelines: - - pipeline: installer-build-resource + - pipeline: dotnet-installer-official-ci-resource source: dotnet-installer-official-ci - trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes + trigger: true + - pipeline: installer-resource + source: installer + trigger: true stages: - stage: build jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml parameters: - tarballResourceId: installer-build-resource + ${{ if eq(variables['System.TeamProject'], 'public') }}: + tarballResourceId: installer-resource + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + tarballResourceId: dotnet-installer-official-ci-resource From 8f2fda8f782b43b4485368a644a4370972bd093f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Nov 2021 16:37:43 -0800 Subject: [PATCH 041/239] Update the WD publish tests to target downlevel as well --- test/EndToEnd/ProjectBuildTests.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index e3377ef9e..1ae6cd59a 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -85,13 +85,15 @@ namespace EndToEnd.Tests .Should().Pass().And.HaveStdOutContaining("Hello, World!"); } - [WindowsOnlyFact] - public void ItCanPublishArm64Winforms() + [WindowsOnlyTheory] + [InlineData("net5.0")] + [InlineData("net6.0")] + public void ItCanPublishArm64Winforms(string TargetFramework) { DirectoryInfo directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; - string newArgs = "winforms --no-restore"; + string newArgs = $"winforms -f {TargetFramework} --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) @@ -111,13 +113,15 @@ namespace EndToEnd.Tests selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly); } - [WindowsOnlyFact] - public void ItCanPublishArm64Wpf() + [WindowsOnlyTheory] + [InlineData("net5.0")] + [InlineData("net6.0")] + public void ItCanPublishArm64Wpf(string TargetFramework) { DirectoryInfo directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; - string newArgs = "wpf --no-restore"; + string newArgs = $"wpf -f {TargetFramework} --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) From 7edbe5c29f5f948b2ba3bbd1e65a0c0c42b8162f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 02:50:28 +0000 Subject: [PATCH 042/239] Update dependencies from https://github.com/dotnet/sdk build 20211112.10 (#12660) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21554.1 to 7.0.100-alpha.1.21561.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21554.1 to 7.0.100-alpha.1.21561.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 7b228108f..ff8a48717 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 60b6eefb3eb13f1e90e656fb28f96d838e06c5cb - + https://github.com/dotnet/templating - 7669cc78ac5d15ad0ee5b68e65d7d6f753fe918b + 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/templating - 7669cc78ac5d15ad0ee5b68e65d7d6f753fe918b + 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 8c81f32aafb7b46678444f5354bc73dcde75a664 + 5899560935260ff35a9ca601c91c75afbaed1f1d - + https://github.com/dotnet/sdk - 8c81f32aafb7b46678444f5354bc73dcde75a664 + 5899560935260ff35a9ca601c91c75afbaed1f1d diff --git a/eng/Versions.props b/eng/Versions.props index cc5df9fb0..40a22ddd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 7.0.100-alpha.1.21554.1 + 7.0.100-alpha.1.21561.3 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21562.9 - 7.0.100-alpha.1.21562.9 + 7.0.100-alpha.1.21562.10 + 7.0.100-alpha.1.21562.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e8992661fac84259f52ae6a4007ffc252837e32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 05:14:44 +0000 Subject: [PATCH 043/239] Update dependencies from https://github.com/dotnet/sdk build 20211112.12 (#12661) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21562.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff8a48717..28cfa2683 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 5fa6dd364982be4ffd83358adbf130d88049c72a - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 - + https://github.com/dotnet/aspnetcore - 337b53cd379cf591f218fc8c085a6ae583c12018 + 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 5899560935260ff35a9ca601c91c75afbaed1f1d + c76009e7cbb1f8e5645af954de88dfe207bd2851 - + https://github.com/dotnet/sdk - 5899560935260ff35a9ca601c91c75afbaed1f1d + c76009e7cbb1f8e5645af954de88dfe207bd2851 diff --git a/eng/Versions.props b/eng/Versions.props index 40a22ddd9..4eebad1c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.6 0.2.0 - 7.0.100-alpha.1.21562.10 - 7.0.100-alpha.1.21562.10 + 7.0.100-alpha.1.21562.12 + 7.0.100-alpha.1.21562.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e336960b3f574addc28bd5d3fe44c85550978a0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 16:56:39 +0000 Subject: [PATCH 044/239] [main] Update dependencies from dotnet/sdk (#12662) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21562.6 to 7.0.0-alpha.1.21562.7 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21559-03 to 17.1.0-preview-21562-01 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.18 to 7.0.0-alpha.1.21562.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28cfa2683..6fccd0132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 0ba1c9c58bfdaa964bd88d729a2ccab3da55380d - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5fa6dd364982be4ffd83358adbf130d88049c72a + 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 - + https://github.com/dotnet/aspnetcore - 13569cfcf8594029f7b25b3d7a0936ee5063c4f5 + f481e27289f2cff0e66c986a1f2964f35a512803 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - c76009e7cbb1f8e5645af954de88dfe207bd2851 + 8765fa05c1b4da5a1dd756994f7a07ad17e7e79c - + https://github.com/dotnet/sdk - c76009e7cbb1f8e5645af954de88dfe207bd2851 + 8765fa05c1b4da5a1dd756994f7a07ad17e7e79c @@ -142,9 +142,9 @@ add472bbed002fcea9232e89793d0762cc71c5cf - + https://github.com/dotnet/msbuild - 2b604c3a38772f7d70b369e0ad0da32257ed1b35 + 75fad117eefa07b5444901a45b62c29c7c7892f6 diff --git a/eng/Versions.props b/eng/Versions.props index 4eebad1c8..b3639273c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,36 +45,36 @@ - 7.0.0-alpha.1.21562.6 - 7.0.0-alpha.1.21562.6 - 7.0.0-alpha.1.21562.6 - 7.0.0-alpha.1.21562.6 - 7.0.0-alpha.1.21562.6 - 7.0.0-alpha.1.21562.6 + 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21562.7 0.2.0 - 7.0.100-alpha.1.21562.12 - 7.0.100-alpha.1.21562.12 + 7.0.100-alpha.1.21563.3 + 7.0.100-alpha.1.21563.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21561.18 + 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21561.18 - 7.0.0-alpha.1.21561.18 - 7.0.0-alpha.1.21561.18 - 7.0.0-alpha.1.21561.18 - 7.0.0-alpha.1.21561.18 - 7.0.0-alpha.1.21561.18 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21562.1 2.1.0 From f8128a5d5d6bf56375adb92eb3e9bd392c3d3dad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 20:49:58 +0000 Subject: [PATCH 045/239] Update dependencies from https://github.com/dotnet/sdk build 20211113.4 (#12663) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21562.7 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fccd0132..4c2d25106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 - + https://github.com/dotnet/aspnetcore - f481e27289f2cff0e66c986a1f2964f35a512803 + dc06c2d0392f1130ad6addd630e3bc277f2696c5 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 8765fa05c1b4da5a1dd756994f7a07ad17e7e79c + 4187de5cc35db288897f31a68b93b8aaa2487cd3 - + https://github.com/dotnet/sdk - 8765fa05c1b4da5a1dd756994f7a07ad17e7e79c + 4187de5cc35db288897f31a68b93b8aaa2487cd3 diff --git a/eng/Versions.props b/eng/Versions.props index b3639273c..732b85e3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21562.7 - 7.0.0-alpha.1.21562.7 - 7.0.0-alpha.1.21562.7 - 7.0.0-alpha.1.21562.7 - 7.0.0-alpha.1.21562.7 - 7.0.0-alpha.1.21562.7 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 0.2.0 - 7.0.100-alpha.1.21563.3 - 7.0.100-alpha.1.21563.3 + 7.0.100-alpha.1.21563.4 + 7.0.100-alpha.1.21563.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8c53fc9908060baf015bc059b170ee73252bf4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Nov 2021 16:36:49 +0000 Subject: [PATCH 046/239] Update dependencies from https://github.com/dotnet/sdk build 20211114.1 (#12664) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21561.11 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.11 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21561.11 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.11 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21561.9 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.11 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21561.9 to 7.0.0-alpha.1.21563.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c2d25106..9d1a1cb42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 0ba1c9c58bfdaa964bd88d729a2ccab3da55380d + 937e482e1525c690c76d5070195a50232dfbb0bb - + https://github.com/dotnet/windowsdesktop - 0ba1c9c58bfdaa964bd88d729a2ccab3da55380d + 937e482e1525c690c76d5070195a50232dfbb0bb - + https://github.com/dotnet/windowsdesktop - 0ba1c9c58bfdaa964bd88d729a2ccab3da55380d + 937e482e1525c690c76d5070195a50232dfbb0bb - + https://github.com/dotnet/windowsdesktop - 0ba1c9c58bfdaa964bd88d729a2ccab3da55380d + 937e482e1525c690c76d5070195a50232dfbb0bb https://github.com/dotnet/runtime @@ -99,23 +99,23 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 4187de5cc35db288897f31a68b93b8aaa2487cd3 + 9cbf6d46f40f215ca9f7ce0f3d1640bcb11b5a2f - + https://github.com/dotnet/sdk - 4187de5cc35db288897f31a68b93b8aaa2487cd3 + 9cbf6d46f40f215ca9f7ce0f3d1640bcb11b5a2f - + https://github.com/dotnet/winforms - 7ce653ce1d831ba80dd02882745b6b3b28053f6c + f023688c2f08967c2e1139c85c0e2d38d245c367 - + https://github.com/dotnet/wpf - 6031b232f379ac75b8d7d315048b9d47afa87e15 + f9146b1c25d8608d991732836c6ca49e4e071ec0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 732b85e3a..fbbbb46f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 7.0.0-alpha.1.21561.9 + 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21561.9 + 7.0.0-alpha.1.21563.1 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21563.4 - 7.0.100-alpha.1.21563.4 + 7.0.100-alpha.1.21564.1 + 7.0.100-alpha.1.21564.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,10 +79,10 @@ - 7.0.0-alpha.1.21561.11 - 7.0.0-alpha.1.21561.11 - 7.0.0-alpha.1.21561.11 - 7.0.0-alpha.1.21561.11 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21563.1 From 433829c87ef208130ad3191454e3c917418c431a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 12:52:08 +0000 Subject: [PATCH 047/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.1 (#12665) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21561.1 to 7.0.100-1.21562.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d1a1cb42..c3434ae05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 9cbf6d46f40f215ca9f7ce0f3d1640bcb11b5a2f + 5425d95425843ea7729cf83b62cb5c15b5fdf29f - + https://github.com/dotnet/sdk - 9cbf6d46f40f215ca9f7ce0f3d1640bcb11b5a2f + 5425d95425843ea7729cf83b62cb5c15b5fdf29f @@ -131,9 +131,9 @@ c80070733b5dfd08459274189082806358b16daa - + https://github.com/dotnet/linker - 1d47968b26535eae0ab4b0463efdcd6f13178193 + f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 linker diff --git a/eng/Versions.props b/eng/Versions.props index fbbbb46f3..eefe8cab6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21564.1 - 7.0.100-alpha.1.21564.1 + 7.0.100-alpha.1.21565.1 + 7.0.100-alpha.1.21565.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4159ef07b9242b333c2bae385e0941ec5267fd23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 13:51:10 +0000 Subject: [PATCH 048/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.2 (#12666) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3434ae05..97e30bca8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/aspnetcore - dc06c2d0392f1130ad6addd630e3bc277f2696c5 + f186d9c9814825d70245db608dbf335a04727f4b https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 659138bcba10e2fab5a1ec37d06974d8c6fd7520 - + https://github.com/dotnet/sdk - 5425d95425843ea7729cf83b62cb5c15b5fdf29f + d485e4593404ec6e5d79e44c484bcbef3e5d65ea - + https://github.com/dotnet/sdk - 5425d95425843ea7729cf83b62cb5c15b5fdf29f + d485e4593404ec6e5d79e44c484bcbef3e5d65ea diff --git a/eng/Versions.props b/eng/Versions.props index eefe8cab6..5054dcced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21564.1 0.2.0 - 7.0.100-alpha.1.21565.1 - 7.0.100-alpha.1.21565.1 + 7.0.100-alpha.1.21565.2 + 7.0.100-alpha.1.21565.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b20d034900f2dbf39e8691981e0ad57dbda36fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 15:43:18 +0000 Subject: [PATCH 049/239] Update dependencies from https://github.com/dotnet/test-templates build 20211115.1 (#12667) [main] 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 97e30bca8..66d4da5eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore f186d9c9814825d70245db608dbf335a04727f4b - + https://github.com/dotnet/test-templates - 60b6eefb3eb13f1e90e656fb28f96d838e06c5cb + 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/test-templates - 60b6eefb3eb13f1e90e656fb28f96d838e06c5cb + 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/test-templates - 60b6eefb3eb13f1e90e656fb28f96d838e06c5cb + 9844984f8118380856a6f8e247cdb7f496408cd2 diff --git a/eng/Versions.props b/eng/Versions.props index 5054dcced..d8ebccb99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 1.0.2-beta4.21552.1 - 1.0.2-beta4.21552.1 + 1.0.2-beta4.21565.1 + 1.0.2-beta4.21565.1 @@ -146,7 +146,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21552.1 + 1.0.2-beta4.21565.1 2.1.30 From 86fe76957f43a9c40a8c06475cd1c4c3e0e3d307 Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Mon, 15 Nov 2021 08:37:04 -0800 Subject: [PATCH 050/239] Port #12374 to release/6.0.1xx (#12636) Add downloading of runtime assets from dotnetbuilds --- .vsts-ci.yml | 2 ++ .../tarball/content/repos/installer.proj | 7 ++--- src/redist/targets/GenerateLayout.targets | 31 +++++++++++-------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5d0247741..d801654bb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -36,9 +36,11 @@ variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-MSRC-Storage + - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) stages: - stage: build diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index a3a2f394c..712d7cd14 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -31,11 +31,8 @@ $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) - - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) - - - $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) + + $(BuildCommandArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f2cc4113b..3917efa60 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -34,9 +34,7 @@ true https://dotnetclimsrc.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ $(HostRid) $(OSName)-$(Architecture) @@ -104,11 +102,11 @@ - $(CoreSetupBlobRootUrl)Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)WindowsDesktop/ + $(PublicBaseURL)Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)aspnetcore/Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)WindowsDesktop/ $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -245,8 +243,8 @@ - $(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) - $(DotnetToolsetBlobRootUrl) + $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(PublicBaseURL) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) @@ -344,9 +342,7 @@ Replaces the public base url with the private one. --> %(BaseUrl) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(CoreSetupBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetExtensionsBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetToolsetBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)')) - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) - - - $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) + + $(BuildCommandArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f2cc4113b..3917efa60 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -34,9 +34,7 @@ true https://dotnetclimsrc.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ $(HostRid) $(OSName)-$(Architecture) @@ -104,11 +102,11 @@ - $(CoreSetupBlobRootUrl)Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)WindowsDesktop/ + $(PublicBaseURL)Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)aspnetcore/Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)WindowsDesktop/ $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -245,8 +243,8 @@ - $(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) - $(DotnetToolsetBlobRootUrl) + $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(PublicBaseURL) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) @@ -344,9 +342,7 @@ Replaces the public base url with the private one. --> %(BaseUrl) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(CoreSetupBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetExtensionsBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetToolsetBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)')) @@ -131,9 +131,9 @@ c80070733b5dfd08459274189082806358b16daa - + https://github.com/dotnet/linker - f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 + 1bd0af283d629863b04ba6eb6eb93bc0b662708e linker diff --git a/eng/Versions.props b/eng/Versions.props index d8ebccb99..398c4e533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.2 - 7.0.100-alpha.1.21565.2 + 7.0.100-alpha.1.21565.4 + 7.0.100-alpha.1.21565.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 196bbe3036b249bf5eeec261f666d3f7cf5ce386 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 20:07:24 +0000 Subject: [PATCH 054/239] Update dependencies from https://github.com/dotnet/arcade build 20211112.1 (#12670) [release/6.0.2xx] 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 5711c22d8..cd5552022 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/arcade - ee9b7f19853685805c612103282c8d9486c7db86 + ad9890056979bc704773746d927dfdfa5bec7227 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 18ed2689e..132835bb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21560.2 + 6.0.0-beta.21562.1 diff --git a/global.json b/global.json index b785d4545..e6d26905e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21562.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" } } From 69022825a3415d4e79ba81906d272de76127f29e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Nov 2021 13:47:22 -0800 Subject: [PATCH 055/239] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 96cf3c3e8..c2faa27f6 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -199,8 +199,8 @@ - - + + @@ -131,9 +131,9 @@ c80070733b5dfd08459274189082806358b16daa - + https://github.com/dotnet/linker - 1bd0af283d629863b04ba6eb6eb93bc0b662708e + d74c97b5fb356c257caaa546516ca430ed579e24 linker diff --git a/eng/Versions.props b/eng/Versions.props index 398c4e533..e684e64eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 0.2.0 - 7.0.100-alpha.1.21565.4 - 7.0.100-alpha.1.21565.4 + 7.0.100-alpha.1.21565.8 + 7.0.100-alpha.1.21565.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8ef238338397e217e032f65c2ff4c42bf96cfd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:19:24 +0000 Subject: [PATCH 059/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.10 (#12676) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21561.3 to 7.0.100-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21561.3 to 7.0.100-alpha.1.21565.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 661533cf6..25c53e03e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/templating - 659138bcba10e2fab5a1ec37d06974d8c6fd7520 + 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/templating - 659138bcba10e2fab5a1ec37d06974d8c6fd7520 + 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - f6027add337e3b34720d8640877b4bfa9b1e6031 + f70222d05ef70e4fd44ff872e1c86260481243bc - + https://github.com/dotnet/sdk - f6027add337e3b34720d8640877b4bfa9b1e6031 + f70222d05ef70e4fd44ff872e1c86260481243bc diff --git a/eng/Versions.props b/eng/Versions.props index e684e64eb..6cfc49b31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 7.0.100-alpha.1.21561.3 + 7.0.100-alpha.1.21565.1 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.8 - 7.0.100-alpha.1.21565.8 + 7.0.100-alpha.1.21565.10 + 7.0.100-alpha.1.21565.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f02ccd30f55e7ac3436bd32af4b207869541ebf Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 15 Nov 2021 17:44:44 -0600 Subject: [PATCH 060/239] Fix previously-source-built bootstrap (#12642) * Fix previously-source-built bootstrap * Update based on review comments * Update to write lines more efficiently --- .../buildBootstrapPreviouslySB.csproj | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj index 090db5fbf..0a2fcff17 100644 --- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj @@ -49,13 +49,47 @@ - + + + + + + + + + @(SourceFileName->'%(Filename)') + $(DestinationFileName.Replace('$(PackageName.ToLower()).','')) + + + + + + $([System.String]::concat('%3C','$(PackageName)','Version','%3E').Replace('.','')) + $([System.String]::concat('%3C','$(PackageName)','PackageVersion','%3E').Replace('.','')) + $(DestinationPath)PackageVersions.props + + + From 0a15dda3648cb689a4fd9f6184fd8ec9d34c7805 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:26:36 +0000 Subject: [PATCH 061/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.17 (#12677) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21565.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25c53e03e..d74639a12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 - + https://github.com/dotnet/aspnetcore - 5247048126a2bdfac17d44d63d497055a53d08a2 + 9681eb412da8ce178c1d6a4316a2023f3d0d9628 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - f70222d05ef70e4fd44ff872e1c86260481243bc + 71f5a976fc47be4d3a9b00ed327c281b902dc753 - + https://github.com/dotnet/sdk - f70222d05ef70e4fd44ff872e1c86260481243bc + 71f5a976fc47be4d3a9b00ed327c281b902dc753 diff --git a/eng/Versions.props b/eng/Versions.props index 6cfc49b31..85fadd162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.4 0.2.0 - 7.0.100-alpha.1.21565.10 - 7.0.100-alpha.1.21565.10 + 7.0.100-alpha.1.21565.17 + 7.0.100-alpha.1.21565.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f60e642d4259efef45a21752552f213d5c21e2f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 03:48:13 +0000 Subject: [PATCH 062/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.21 (#12678) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211112-03 to 17.1.0-preview-20211115-01 (parent: Microsoft.NET.Sdk) --- 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 d74639a12..e89f88b82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - 71f5a976fc47be4d3a9b00ed327c281b902dc753 + 628f272493cbbd72893d2771ff0ec77b52fe0365 - + https://github.com/dotnet/sdk - 71f5a976fc47be4d3a9b00ed327c281b902dc753 + 628f272493cbbd72893d2771ff0ec77b52fe0365 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - c80070733b5dfd08459274189082806358b16daa + a413f44a4cba32e6c428cdad33a1b7f7789e7648 diff --git a/eng/Versions.props b/eng/Versions.props index 85fadd162..8bacbfc22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.17 - 7.0.100-alpha.1.21565.17 + 7.0.100-alpha.1.21565.21 + 7.0.100-alpha.1.21565.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211112-03 + 17.1.0-preview-20211115-01 From 4bf129ec9aa2915b1b6b9e7355ec82333aef35cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 05:19:24 +0000 Subject: [PATCH 063/239] [main] Update dependencies from dotnet/sdk (#12679) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21565.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21563.1 to 7.0.0-alpha.1.21564.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e89f88b82..75955b4d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 937e482e1525c690c76d5070195a50232dfbb0bb + 4f381335f7c7e55f8679d080b7b69a037bbf2e7f - + https://github.com/dotnet/windowsdesktop - 937e482e1525c690c76d5070195a50232dfbb0bb + 4f381335f7c7e55f8679d080b7b69a037bbf2e7f - + https://github.com/dotnet/windowsdesktop - 937e482e1525c690c76d5070195a50232dfbb0bb + 4f381335f7c7e55f8679d080b7b69a037bbf2e7f - + https://github.com/dotnet/windowsdesktop - 937e482e1525c690c76d5070195a50232dfbb0bb + 4f381335f7c7e55f8679d080b7b69a037bbf2e7f https://github.com/dotnet/runtime @@ -99,23 +99,23 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - 628f272493cbbd72893d2771ff0ec77b52fe0365 + 074bec881e59689a179149c5dcd34b6e4fc3e95d - + https://github.com/dotnet/sdk - 628f272493cbbd72893d2771ff0ec77b52fe0365 + 074bec881e59689a179149c5dcd34b6e4fc3e95d - + https://github.com/dotnet/winforms - f023688c2f08967c2e1139c85c0e2d38d245c367 + a8905ab4ba4981db444644a2b028fbff92f41893 - + https://github.com/dotnet/wpf - f9146b1c25d8608d991732836c6ca49e4e071ec0 + 6fca78123454122417d0ec76c0dcbccec22fee0f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8bacbfc22..ce6905f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21564.1 - 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21564.1 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.21 - 7.0.100-alpha.1.21565.21 + 7.0.100-alpha.1.21565.26 + 7.0.100-alpha.1.21565.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,10 +79,10 @@ - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 - 7.0.0-alpha.1.21563.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21565.1 From cf115e98d3a0ea19eadabbe4f8ea175447dbff69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 06:15:54 +0000 Subject: [PATCH 064/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.28 (#12680) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21565.4 to 7.0.0-alpha.1.21565.8 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21565.2 to 7.0.100-1.21565.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75955b4d7..b756a5c93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd - + https://github.com/dotnet/aspnetcore - 9681eb412da8ce178c1d6a4316a2023f3d0d9628 + c0778f05020f8d99481e479553dc024298c108dd https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - 074bec881e59689a179149c5dcd34b6e4fc3e95d + ed1b1ae84daad200ae1ef7cf2f02e1a8206f6070 - + https://github.com/dotnet/sdk - 074bec881e59689a179149c5dcd34b6e4fc3e95d + ed1b1ae84daad200ae1ef7cf2f02e1a8206f6070 @@ -131,9 +131,9 @@ a413f44a4cba32e6c428cdad33a1b7f7789e7648 - + https://github.com/dotnet/linker - d74c97b5fb356c257caaa546516ca430ed579e24 + c90ed0aee46fb24873d95ebaea80a2d11b29a957 linker diff --git a/eng/Versions.props b/eng/Versions.props index ce6905f3b..83201a10a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21565.4 - 7.0.0-alpha.1.21565.4 - 7.0.0-alpha.1.21565.4 - 7.0.0-alpha.1.21565.4 - 7.0.0-alpha.1.21565.4 - 7.0.0-alpha.1.21565.4 + 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21565.8 0.2.0 - 7.0.100-alpha.1.21565.26 - 7.0.100-alpha.1.21565.26 + 7.0.100-alpha.1.21565.28 + 7.0.100-alpha.1.21565.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44b95053df97ef1ebecdf069b6efc00e90e87236 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 09:42:16 +0000 Subject: [PATCH 065/239] Update dependencies from https://github.com/dotnet/sdk build 20211115.37 (#12681) [main] Update dependencies from dotnet/sdk --- 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 b756a5c93..e61c454c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - ed1b1ae84daad200ae1ef7cf2f02e1a8206f6070 + 2d2e95a784de447dcb1229d1dcf0ef15a5249b6d - + https://github.com/dotnet/sdk - ed1b1ae84daad200ae1ef7cf2f02e1a8206f6070 + 2d2e95a784de447dcb1229d1dcf0ef15a5249b6d diff --git a/eng/Versions.props b/eng/Versions.props index 83201a10a..06fae148a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.28 - 7.0.100-alpha.1.21565.28 + 7.0.100-alpha.1.21565.37 + 7.0.100-alpha.1.21565.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db0dfa0c082e4a4e690d1cbb8e3588e3cb949092 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 13:16:06 +0000 Subject: [PATCH 066/239] Update dependencies from https://github.com/dotnet/sdk build 20211116.1 (#12682) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211115-01 to 17.1.0-preview-20211116-01 (parent: Microsoft.NET.Sdk) --- 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 e61c454c5..8a89e5bff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - 2d2e95a784de447dcb1229d1dcf0ef15a5249b6d + 88fe1ec1883b3d266d151e2d40023a1d03111a02 - + https://github.com/dotnet/sdk - 2d2e95a784de447dcb1229d1dcf0ef15a5249b6d + 88fe1ec1883b3d266d151e2d40023a1d03111a02 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - a413f44a4cba32e6c428cdad33a1b7f7789e7648 + a1920dcf549f8935bb5505dea9a8110ca48199f5 diff --git a/eng/Versions.props b/eng/Versions.props index 06fae148a..1f0918adf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21565.37 - 7.0.100-alpha.1.21565.37 + 7.0.100-alpha.1.21566.1 + 7.0.100-alpha.1.21566.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211115-01 + 17.1.0-preview-20211116-01 From bbe021ff2b53fecb0ebb17b589889c512f8c240b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 16 Nov 2021 18:19:09 +0000 Subject: [PATCH 067/239] Resolve source-build patch conflicts --- ...nk-in-source-build-for-.version-file.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch deleted file mode 100644 index bec3c2a3f..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 26 Oct 2021 15:41:57 -0500 -Subject: [PATCH] Enable source-link in source-build for '.version' file - -See https://github.com/dotnet/source-build/issues/2569 ---- - eng/SourceBuild.props | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index bba40f534e5..b70f668a15b 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -23,14 +23,6 @@ - minimal - - -- -- -- -- -- -- -- -- - - From 5ea80f463a32ea2771df1dab10a2ad1d5e270b4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:02:32 +0000 Subject: [PATCH 068/239] Update dependencies from https://github.com/dotnet/sdk build 20211116.3 (#12684) [main] Update dependencies from dotnet/sdk --- 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 8a89e5bff..a2e4cdf9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - 88fe1ec1883b3d266d151e2d40023a1d03111a02 + b10f5bbe505f5a0bb491c3b865ad24ad3179186d - + https://github.com/dotnet/sdk - 88fe1ec1883b3d266d151e2d40023a1d03111a02 + b10f5bbe505f5a0bb491c3b865ad24ad3179186d diff --git a/eng/Versions.props b/eng/Versions.props index 1f0918adf..dfb8d480a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21566.1 - 7.0.100-alpha.1.21566.1 + 7.0.100-alpha.1.21566.3 + 7.0.100-alpha.1.21566.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4078d7d02383c83bbcd4e20e4fdd0e51a1885006 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 12:29:44 -0800 Subject: [PATCH 069/239] Merge pull request #12613 from dotnet/darc-release/6.0.2xx-1b244fc7-ac70-4eca-9fcf-17a28ef743e0 [release/6.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 2 - eng/Version.Details.xml | 28 +-- eng/Versions.props | 6 +- .../0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- ...on-downlevel-frameworks-during-sourc.patch | 167 ------------------ ...built-jnm2.ReferenceAssemblies.net35.patch | 36 ---- ...nnedApiAnalyzers-during-source-build.patch | 29 --- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 6 +- ...ed-source-build-patches-and-re-patch.patch | 2 +- ...vstest.console-netcoreapp2.1-support.patch | 26 --- ...r-win-runtime-identifier-in-source-b.patch | 40 ----- 11 files changed, 22 insertions(+), 322 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch delete mode 100644 src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch diff --git a/NuGet.config b/NuGet.config index b995dca0c..ae8794e04 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5552022..899992b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + af3b7d0f15282afee493e61c10b0bb170317de8d - + https://github.com/dotnet/sdk - 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f + af3b7d0f15282afee493e61c10b0bb170317de8d @@ -121,18 +121,18 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 + a413f44a4cba32e6c428cdad33a1b7f7789e7648 @@ -146,14 +146,14 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + 233c037aa97b18982d34d26976e87c677bb013e8 - + https://github.com/nuget/nuget.client - 078701b97eeef2283c1f4605032b5bcf55a80653 + a998efecd431ec8a41536b5ac0152c16f1e2e646 diff --git a/eng/Versions.props b/eng/Versions.props index 132835bb7..be955ff74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21527.8 - 6.0.100-rtm.21527.8 + 6.0.200-preview.21565.34 + 6.0.200-preview.21565.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0 + 17.1.0-preview-20211115-01 diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7d5d03116..7c19d6a40 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21526.21 + 4.0.0-6.21515.3 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch deleted file mode 100644 index d9a483852..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 19 Oct 2021 16:11:51 -0500 -Subject: [PATCH] Disable apphost on downlevel frameworks during source-build - -During source-build, disable apphost build for 'fsi' and 'fsc', and -'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build. - -Creating an apphost for a net5.0 project while building with a net6.0 -SDK downloads the apphost pack as a prebuilt. Stopping the projects from -creating the apphost removes the prebuilt for source-build. - -To make disabling the apphost work in the bootstrapping build, add a -check to eng/build.sh to skip the bootstrap build if we're currently -running the "outer" source-build. That gives source-build the ability to -run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs -bootstrapping, it can pass the DotNetBuildFromSource property through -the environment so it takes effect. - -See: https://github.com/dotnet/fsharp/issues/12282 - -PR: https://github.com/dotnet/fsharp/pull/12286 ---- - eng/SourceBuild.props | 2 +- - eng/build.sh | 51 ++++++++++--------- - .../AssemblyCheck/AssemblyCheck.fsproj | 1 + - src/buildtools/fslex/fslex.fsproj | 1 + - src/buildtools/fsyacc/fsyacc.fsproj | 1 + - src/fsharp/fsc/fsc.fsproj | 1 + - src/fsharp/fsi/fsi.fsproj | 1 + - 7 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 22c929f28..903ee00d3 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -41,7 +41,7 @@ - -+ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" /> - - - -diff --git a/eng/build.sh b/eng/build.sh -index 9a2aa0083..6af422237 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -240,29 +240,34 @@ function BuildSolution { - node_reuse=false - - # build bootstrap tools -- bootstrap_config=Proto -- bootstrap_dir=$artifacts_dir/Bootstrap -- if [[ "$force_bootstrap" == true ]]; then -- rm -fr $bootstrap_dir -- fi -- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then -- BuildMessage="Error building tools" -- MSBuild "$repo_root/src/buildtools/buildtools.proj" \ -- /restore \ -- /p:Configuration=$bootstrap_config -- -- mkdir -p "$bootstrap_dir" -- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex -- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc -- fi -- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then -- BuildMessage="Error building bootstrap" -- MSBuild "$repo_root/proto.proj" \ -- /restore \ -- /p:Configuration=$bootstrap_config \ -- -- -- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc -+ # source_build=true means we are currently in the outer/wrapper source-build, -+ # and building bootstrap needs to wait. The source-build targets will run this -+ # script again without setting source_build=true when it is done setting up -+ # the build environment. See 'eng/SourceBuild.props'. -+ if [[ "$source_build" != true ]]; then -+ bootstrap_config=Proto -+ bootstrap_dir=$artifacts_dir/Bootstrap -+ if [[ "$force_bootstrap" == true ]]; then -+ rm -fr $bootstrap_dir -+ fi -+ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then -+ BuildMessage="Error building tools" -+ MSBuild "$repo_root/src/buildtools/buildtools.proj" \ -+ /restore \ -+ /p:Configuration=$bootstrap_config -+ -+ mkdir -p "$bootstrap_dir" -+ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex -+ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc -+ fi -+ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then -+ BuildMessage="Error building bootstrap" -+ MSBuild "$repo_root/proto.proj" \ -+ /restore \ -+ /p:Configuration=$bootstrap_config -+ -+ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc -+ fi - fi - - if [[ "$skip_build" != true ]]; then -diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -index 464b6ef78..5c78bbe6d 100644 ---- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -+++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj -@@ -4,6 +4,7 @@ - Exe - net5.0 - true -+ false - - - -diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj -index 1959ce59c..3d63bf6bf 100644 ---- a/src/buildtools/fslex/fslex.fsproj -+++ b/src/buildtools/fslex/fslex.fsproj -@@ -5,6 +5,7 @@ - net5.0 - INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) - true -+ false - - - -diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj -index 5d1b7141f..63b63c5de 100644 ---- a/src/buildtools/fsyacc/fsyacc.fsproj -+++ b/src/buildtools/fsyacc/fsyacc.fsproj -@@ -5,6 +5,7 @@ - net5.0 - INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) - true -+ false - - - -diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj -index 7fa31fc21..04025c297 100644 ---- a/src/fsharp/fsc/fsc.fsproj -+++ b/src/fsharp/fsc/fsc.fsproj -@@ -12,6 +12,7 @@ - $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 - true - true -+ false - - - -diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj -index 9fd9b1333..eace6c166 100644 ---- a/src/fsharp/fsi/fsi.fsproj -+++ b/src/fsharp/fsi/fsi.fsproj -@@ -13,6 +13,7 @@ - fsi.res - true - true -+ false - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch deleted file mode 100644 index 93717db90..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 11 Oct 2021 17:09:14 -0500 -Subject: [PATCH] Remove prebuilt jnm2.ReferenceAssemblies.net35 - -This prebuilt package filled a gap in the official 1.0 version of the .NET -Framework reference assembly packages. The gap has been fixed in later versions -of the official packages. Removal fixes a prebuilt dependency by letting the -repo use the official version of the packges, which are produced by SBRP. -https://github.com/dotnet/msbuild/issues/6935 ---- - src/StringTools/StringTools.csproj | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/StringTools/StringTools.csproj b/src/StringTools/StringTools.csproj -index fef9909..93a4634 100644 ---- a/src/StringTools/StringTools.csproj -+++ b/src/StringTools/StringTools.csproj -@@ -20,17 +20,12 @@ - - - Microsoft.NET.StringTools.net35 -- -- true - - - - - - -- -- -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch deleted file mode 100644 index b5b0a84f6..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 12 Oct 2021 18:14:59 -0500 -Subject: [PATCH] Disable BannedApiAnalyzers during source-build - -BannedApiAnalyzers has some intentional old dependencies and it's not feasible -to build it during source-build. Remove this usage to remove a prebuilt. -https://github.com/dotnet/msbuild/issues/6961 ---- - eng/Packages.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Packages.props b/eng/Packages.props -index 0f478634f..3cc09a008 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -45,11 +45,11 @@ - - - -+ - - - - -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 6ca89df7d..80f65c174 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -16,12 +16,12 @@ Background Issue: https://github.com/dotnet/source-build/issues/2542 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props -index 2de607c5d..1668addc9 100644 +index 494c9c0..7689042 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -46,9 +46,6 @@ + - - - @@ -34,7 +34,7 @@ index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj +++ b/src/Build/Microsoft.Build.csproj @@ -38,8 +38,10 @@ - + - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 34d37ba0b..36ce5217c 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644 @@ -33,7 +34,7 @@ - + - diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch b/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch deleted file mode 100644 index aa1e198cc..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 21:31:01 +0000 -Subject: [PATCH] Drop vstest.console netcoreapp2.1 support - -Workaround for https://github.com/microsoft/vstest/issues/3044 ---- - src/vstest.console/vstest.console.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj -index 1343e6d9..7c555591 100644 ---- a/src/vstest.console/vstest.console.csproj -+++ b/src/vstest.console/vstest.console.csproj -@@ -8,7 +8,7 @@ - - vstest.console - netcoreapp2.1;net451 -- netcoreapp2.1;net6.0 -+ net6.0 - true - Exe - false --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch deleted file mode 100644 index bd4c13409..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 11 Oct 2021 19:35:15 +0000 -Subject: [PATCH] Don't publish for win runtime identifier in source-build - -See https://github.com/microsoft/vstest/pull/3096 ---- - src/testhost.x86/testhost.x86.csproj | 2 +- - src/testhost/testhost.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 7eb5cd15..09856522 100644 ---- a/src/testhost.x86/testhost.x86.csproj -+++ b/src/testhost.x86/testhost.x86.csproj -@@ -19,7 +19,7 @@ - app.manifest - - -- win7-x86 -+ win7-x86 - false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 - -diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj -index a780e4e9..ba0fd259 100644 ---- a/src/testhost/testhost.csproj -+++ b/src/testhost/testhost.csproj -@@ -16,7 +16,7 @@ - app.manifest - - -- win7-x64 -+ win7-x64 - false - $(AssemblyName).$(TargetFramework) - --- -2.31.1 - From d45a62e9d473436b95ede41397d359d273786222 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 21:08:11 +0000 Subject: [PATCH 070/239] Update dependencies from https://github.com/dotnet/sdk build 20211116.4 (#12685) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-01 to 17.1.0-preview-20211116-02 (parent: Microsoft.NET.Sdk) --- 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 a2e4cdf9e..06cfb374c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - b10f5bbe505f5a0bb491c3b865ad24ad3179186d + e8f741b2dd4a8bc534df44d2b797f2b9bf8c577e - + https://github.com/dotnet/sdk - b10f5bbe505f5a0bb491c3b865ad24ad3179186d + e8f741b2dd4a8bc534df44d2b797f2b9bf8c577e @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - a1920dcf549f8935bb5505dea9a8110ca48199f5 + e6afc59862228696c62377cf4bc9959b5353b44e diff --git a/eng/Versions.props b/eng/Versions.props index dfb8d480a..c1e080e53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21566.3 - 7.0.100-alpha.1.21566.3 + 7.0.100-alpha.1.21566.4 + 7.0.100-alpha.1.21566.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211116-01 + 17.1.0-preview-20211116-02 From 399bef7789bf22ed4c2df12613b45cb921d56e75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 23:49:57 +0000 Subject: [PATCH 071/239] Update dependencies from https://github.com/dotnet/sdk build 20211116.11 (#12687) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21565.8 to 7.0.0-alpha.1.21566.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06cfb374c..443e036b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f - + https://github.com/dotnet/aspnetcore - c0778f05020f8d99481e479553dc024298c108dd + 47b044e642eec6b1ba9f3db071b00d61a4626d5f https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 204e228530cb76de653666af282fc847d72db8bb - + https://github.com/dotnet/sdk - e8f741b2dd4a8bc534df44d2b797f2b9bf8c577e + 463b620277f2814cad238f06706d78fadfe9b3d3 - + https://github.com/dotnet/sdk - e8f741b2dd4a8bc534df44d2b797f2b9bf8c577e + 463b620277f2814cad238f06706d78fadfe9b3d3 diff --git a/eng/Versions.props b/eng/Versions.props index c1e080e53..baef939f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21565.8 - 7.0.0-alpha.1.21565.8 - 7.0.0-alpha.1.21565.8 - 7.0.0-alpha.1.21565.8 - 7.0.0-alpha.1.21565.8 - 7.0.0-alpha.1.21565.8 + 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.4 0.2.0 - 7.0.100-alpha.1.21566.4 - 7.0.100-alpha.1.21566.4 + 7.0.100-alpha.1.21566.11 + 7.0.100-alpha.1.21566.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 365be33db40fc736e2308c7e66781a16c80f3f39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:23:21 +0000 Subject: [PATCH 072/239] Update dependencies from https://github.com/dotnet/sdk build 20211116.12 (#12688) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 899992b3f..3d5e4b0fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - af3b7d0f15282afee493e61c10b0bb170317de8d + b65a2ba4560e2703f24f9a27413e702f3c2af956 - + https://github.com/dotnet/sdk - af3b7d0f15282afee493e61c10b0bb170317de8d + b65a2ba4560e2703f24f9a27413e702f3c2af956 diff --git a/eng/Versions.props b/eng/Versions.props index be955ff74..1ca8df7c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21565.34 - 6.0.200-preview.21565.34 + 6.0.200-preview.21566.12 + 6.0.200-preview.21566.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b412c618011a72bf68efa54d9da2a7692f97e7fe Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 16 Nov 2021 19:48:47 -0600 Subject: [PATCH 073/239] Re-enable F# tests that should work now. (#12686) * Re-enable F# tests that should work now. * Also re-enable some web tests that should work now. --- src/SourceBuild/tarball/content/smoke-test.sh | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index fc034fecc..c679af6f4 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -248,11 +248,10 @@ function doCommand() { echo " terminated with exit code $?" | tee -a "$logFile" elif [ "$1" == "multi-rid-publish" ]; then if [ "$lang" == "F#" ]; then - # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" } else runPublishScenarios() { @@ -270,9 +269,9 @@ function doCommand() { if [ "$lang" == "F#" ]; then # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile" + "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" else - "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1 + "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 fi else if [ "$projectOutput" == "true" ]; then @@ -323,8 +322,7 @@ function runAllTests() { doCommand VB xunit new restore test doCommand VB mstest new restore test - # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 - doCommand F# console new restore build multi-rid-publish + doCommand F# console new restore build run multi-rid-publish doCommand F# classlib new restore build multi-rid-publish doCommand F# xunit new restore test doCommand F# mstest new restore test @@ -349,16 +347,12 @@ function runWebTests() { doCommand C# mvc "$@" new restore build run multi-rid-publish doCommand C# webapi "$@" new restore build multi-rid-publish doCommand C# razor "$@" new restore build run multi-rid-publish - # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 - # doCommand C# blazorwasm "$@" new restore build run publish + doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 - doCommand F# web "$@" new restore build multi-rid-publish - # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 - # doCommand F# mvc "$@" new restore build run multi-rid-publish - # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554 - doCommand F# webapi "$@" new restore build multi-rid-publish + doCommand F# web "$@" new restore build run multi-rid-publish + doCommand F# mvc "$@" new restore build run multi-rid-publish + doCommand F# webapi "$@" new restore build run multi-rid-publish } function runXmlDocTests() { From 5f455c0652cb9ff6560df87e05ece187ec66976b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 05:59:50 +0000 Subject: [PATCH 074/239] [main] Update dependencies from dotnet/sdk (#12690) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21566.4 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21565.1 to 7.0.100-alpha.1.21566.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21565.1 to 7.0.100-alpha.1.21566.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-02 to 17.1.0-preview-20211116-03 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21565.4 to 7.0.100-1.21566.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21562-01 to 17.1.0-preview-21565-02 (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 443e036b4..f23643018 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 35704e44e5d1b158f21512b1c1081a0e025bde3f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f - + https://github.com/dotnet/aspnetcore - 47b044e642eec6b1ba9f3db071b00d61a4626d5f + 0bcacc81d6dada22bd8e0782e86bc94a669d544f https://github.com/dotnet/test-templates @@ -90,23 +90,23 @@ 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/templating - 204e228530cb76de653666af282fc847d72db8bb + 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/templating - 204e228530cb76de653666af282fc847d72db8bb + 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 463b620277f2814cad238f06706d78fadfe9b3d3 + 3ae6e976e9981795d6e3e43d984920779bbbe3a8 - + https://github.com/dotnet/sdk - 463b620277f2814cad238f06706d78fadfe9b3d3 + 3ae6e976e9981795d6e3e43d984920779bbbe3a8 @@ -126,14 +126,14 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - e6afc59862228696c62377cf4bc9959b5353b44e + 011aeee4d491580dfe11477b89696829061a2d9c - + https://github.com/dotnet/linker - c90ed0aee46fb24873d95ebaea80a2d11b29a957 + fc4199347fad064cf297f372b3569b9354229af3 linker @@ -142,9 +142,9 @@ add472bbed002fcea9232e89793d0762cc71c5cf - + https://github.com/dotnet/msbuild - 75fad117eefa07b5444901a45b62c29c7c7892f6 + 233c037aa97b18982d34d26976e87c677bb013e8 diff --git a/eng/Versions.props b/eng/Versions.props index baef939f7..e03f07f6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 7.0.100-alpha.1.21565.1 + 7.0.100-alpha.1.21566.1 @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21566.4 - 7.0.0-alpha.1.21566.4 - 7.0.0-alpha.1.21566.4 - 7.0.0-alpha.1.21566.4 - 7.0.0-alpha.1.21566.4 - 7.0.0-alpha.1.21566.4 + 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21566.6 0.2.0 - 7.0.100-alpha.1.21566.11 - 7.0.100-alpha.1.21566.11 + 7.0.100-alpha.1.21566.17 + 7.0.100-alpha.1.21566.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211116-02 + 17.1.0-preview-20211116-03 From e208af2ba6c276ee0a4a58a13bbdd7ff880ff669 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 14:57:23 +0000 Subject: [PATCH 075/239] Update dependencies from https://github.com/dotnet/arcade build 20211116.10 (#12692) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21551-02 to 1.1.1-beta-21565-01 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 +++--- eng/Versions.props | 2 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 2 +- eng/common/tools.ps1 | 59 +++++++++++++--------- eng/common/tools.sh | 64 +++++++++++++----------- global.json | 4 +- 6 files changed, 83 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f23643018..ae1232366 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,28 +172,28 @@ - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf https://github.com/dotnet/source-build-reference-packages fc184172bf8144f7c91a7bc0226b7d90c5821576 - + https://github.com/dotnet/sourcelink - 02a36d32650b2dbeabb3f5fb318461557c89014d + 4f4f58596278e9ef72d68d7ea80b634e552c9c8f diff --git a/eng/Versions.props b/eng/Versions.props index e03f07f6c..35c0b8f4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21559.3 + 7.0.0-beta.21566.10 diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 1157151f4..e5bef8ebd 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -124,7 +124,7 @@ try { Exec-BlockVerbosely { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` -GuardianCliLocation $guardianCliLocation ` - -WorkingDirectory $workingDirectory ` + -WorkingDirectory $SourceDirectory ` -UpdateBaseline $UpdateBaseline ` -GdnFolder $gdnFolder } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 444842899..90b1f9fdc 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -301,31 +301,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } - } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed + } else { + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break + } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -887,7 +900,7 @@ function Try-LogClientIpAddress() Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" try { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing $lines = $result.Content.Split([Environment]::NewLine) $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" Write-Host $socketIp diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef7..dd7030ff5 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them - local runtimeSourceFeedKey='' + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) + + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) + fi + fi + + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code - fi - } + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -402,7 +408,7 @@ function StopProcesses { function TryLogClientIpAddress () { echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true + curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true fi } diff --git a/global.json b/global.json index f54b1816d..0e78a837f 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.21559.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21559.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21566.10", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21566.10" } } From f12cba30754402bb9574cc5324b4ac3933d17d9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:28:22 +0000 Subject: [PATCH 076/239] [main] Update dependencies from dotnet/sdk (#12691) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21566.2 to 7.0.100-1.21566.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae1232366..d77c12af1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 3ae6e976e9981795d6e3e43d984920779bbbe3a8 + 662a765a08b0f197200c80430cfe75c291f4c67d - + https://github.com/dotnet/sdk - 3ae6e976e9981795d6e3e43d984920779bbbe3a8 + 662a765a08b0f197200c80430cfe75c291f4c67d @@ -131,9 +131,9 @@ 011aeee4d491580dfe11477b89696829061a2d9c - + https://github.com/dotnet/linker - fc4199347fad064cf297f372b3569b9354229af3 + d2febca97dc6d3b1ea9f3ea58d87c10276b92a77 linker diff --git a/eng/Versions.props b/eng/Versions.props index 35c0b8f4f..fd8ca7675 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21566.17 - 7.0.100-alpha.1.21566.17 + 7.0.100-alpha.1.21567.7 + 7.0.100-alpha.1.21567.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 52e577d29b3870f6fa34eec18a0e330e40e31f12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 20:08:45 +0000 Subject: [PATCH 077/239] [main] Update dependencies from dotnet/sdk (#12694) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21566.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21566.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21566.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21566.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21564.1 to 7.0.0-alpha.1.21566.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21565.1 to 7.0.0-alpha.1.21566.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21564.1 to 7.0.0-alpha.1.21566.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Build: from 17.1.0-preview-21565-02 to 17.1.0-preview-21567-01 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21562.1 to 7.0.0-alpha.1.21567.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d77c12af1..ddbc22e0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 4f381335f7c7e55f8679d080b7b69a037bbf2e7f + 7214df3a9275a3a5e30c3045a69d5c26e709a55d - + https://github.com/dotnet/windowsdesktop - 4f381335f7c7e55f8679d080b7b69a037bbf2e7f + 7214df3a9275a3a5e30c3045a69d5c26e709a55d - + https://github.com/dotnet/windowsdesktop - 4f381335f7c7e55f8679d080b7b69a037bbf2e7f + 7214df3a9275a3a5e30c3045a69d5c26e709a55d - + https://github.com/dotnet/windowsdesktop - 4f381335f7c7e55f8679d080b7b69a037bbf2e7f + 7214df3a9275a3a5e30c3045a69d5c26e709a55d - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 35704e44e5d1b158f21512b1c1081a0e025bde3f + 10e107debae28de4bd1e710cfe448be3c293e841 https://github.com/dotnet/aspnetcore @@ -99,23 +99,23 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 662a765a08b0f197200c80430cfe75c291f4c67d + 874f68563b2b9e6bc6347811b958017fb302cc16 - + https://github.com/dotnet/sdk - 662a765a08b0f197200c80430cfe75c291f4c67d + 874f68563b2b9e6bc6347811b958017fb302cc16 - + https://github.com/dotnet/winforms - a8905ab4ba4981db444644a2b028fbff92f41893 + 5a5a7c7874d9a707328d4e69a6fffca1998bc1e3 - + https://github.com/dotnet/wpf - 6fca78123454122417d0ec76c0dcbccec22fee0f + 19b4ef3e3621c1d8252e000d920920fdf64cf858 https://github.com/dotnet/fsharp @@ -142,9 +142,9 @@ add472bbed002fcea9232e89793d0762cc71c5cf - + https://github.com/dotnet/msbuild - 233c037aa97b18982d34d26976e87c677bb013e8 + 7434b575d12157ef98aeaad3b86c8f235f551c41 diff --git a/eng/Versions.props b/eng/Versions.props index fd8ca7675..38f51c434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21566.2 - 7.0.0-alpha.1.21564.1 + 7.0.0-alpha.1.21566.6 @@ -57,32 +57,32 @@ - 7.0.100-alpha.1.21567.7 - 7.0.100-alpha.1.21567.7 + 7.0.100-alpha.1.21567.13 + 7.0.100-alpha.1.21567.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 - 7.0.0-alpha.1.21562.1 + 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21567.1 2.1.0 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 - 7.0.0-alpha.1.21565.1 + 7.0.0-alpha.1.21566.3 + 7.0.0-alpha.1.21566.3 + 7.0.0-alpha.1.21566.3 + 7.0.0-alpha.1.21566.3 From 40935f142f3666d2bf297cd30bc8dba5ef1ea730 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:57:31 +0000 Subject: [PATCH 078/239] Update dependencies from https://github.com/dotnet/sdk build 20211117.14 (#12695) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk) --- 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 ddbc22e0a..57b489e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 874f68563b2b9e6bc6347811b958017fb302cc16 + 589443cbb9d229cbda709306b8ac1ba0423e9b6d - + https://github.com/dotnet/sdk - 874f68563b2b9e6bc6347811b958017fb302cc16 + 589443cbb9d229cbda709306b8ac1ba0423e9b6d @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 011aeee4d491580dfe11477b89696829061a2d9c + a75faf902a1a5adeb6efbf8e392795c8f7e7f94c diff --git a/eng/Versions.props b/eng/Versions.props index 38f51c434..78c4f0c51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21567.13 - 7.0.100-alpha.1.21567.13 + 7.0.100-alpha.1.21567.14 + 7.0.100-alpha.1.21567.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211116-03 + 17.1.0-preview-20211117-01 From 836def04239a36aaaf89bdc5aae5d88e6055719f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 Nov 2021 16:07:20 -0600 Subject: [PATCH 079/239] Add bootstrap build to CI (#12651) --- .../job/source-build-run-tarball-build.yml | 148 ++++++++++-------- .../steps/source-build-build-tarball.yml | 75 +++++++++ 2 files changed, 157 insertions(+), 66 deletions(-) create mode 100644 src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml 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 index 18bb80b22..6f36d7825 100644 --- 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 @@ -10,87 +10,103 @@ parameters: # The resource id of the tarball to download and build tarballResourceId: current + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + poolInternal: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + poolPublic: + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + tarballDir: $(Build.StagingDirectory)/tarball + jobs: -- job: Source_Build_Run_Tarball_Build +- job: Build_Tarball condition: ${{ parameters.condition }} - displayName: Source-Build Build Tarball + displayName: Build Tarball dependsOn: ${{ parameters.dependsOn }} pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + ${{ parameters.poolPublic }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + ${{ parameters.poolInternal }} strategy: matrix: Fedora33-Online: - _runOnline: true - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: true Fedora33-Offline: - _runOnline: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 - variables: - _TarballDir: $(Build.StagingDirectory)/tarball - _BuildConfig: Release - _BuildArch: x64 workspace: clean: all steps: - checkout: none - - download: ${{ parameters.tarballResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Tarball - - - script: | - set -x - - resourceIdPathSegment= - if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then - resourceIdPathSegment='${{ parameters.tarballResourceId }}/' - 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 - - docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./prep.sh - displayName: Prep Tarball - - - script: | - set -x - df -h - - networkArgs= - customBuildArgs= - if [ '$(_runOnline)' = 'true' ]; then - customBuildArgs='--online' - else - networkArgs='--network none' - fi - - docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true - displayName: Build Tarball - - - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/' - artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) - displayName: Publish Source Build Artifacts - - - script: | - set -x - - docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test - displayName: Run Tests - - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml parameters: - sourceFolder: $(_TarballDir) + buildArch: $(_BuildArch) + container: $(_Container) + prepScript: | + set -x + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh + runOnline: $(_RunOnline) + tarballDir: ${{ parameters.tarballDir }} + tarballResourceId: ${{ parameters.tarballResourceId }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - job: Rebuild_Tarball + displayName: Rebuild Tarball With Previous + dependsOn: Build_Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublic }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternal }} + strategy: + matrix: + Fedora33-Offline: + _PreviousSourceBuildArtifact: Build Tarball Fedora33-Offline_Artifacts + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false + timeoutInMinutes: 180 + workspace: + clean: all + + steps: + - checkout: none + + - 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: ${{ parameters.tarballDir }}/packages/archive/ + + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml + parameters: + additionalBuildArgs: --with-sdk /tarball/.dotnet + buildArch: $(_BuildArch) + container: $(_Container) + prepScript: | + set -x + + mkdir ${{ parameters.tarballDir }}/.dotnet + tarballFilePath="${{ parameters.tarballDir }}/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}/.dotnet" + eval rm -f "$tarballFilePath" + runOnline: $(_RunOnline) + tarballDir: ${{ parameters.tarballDir }} + tarballResourceId: ${{ parameters.tarballResourceId }} diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml new file mode 100644 index 000000000..30e55607d --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -0,0 +1,75 @@ +# Steps used to build a source-build tarball + +parameters: + # Additional custom build args + additionalBuildArgs: "" + + # Architecture to build + buildArch: null + + # Container image to build within + container: null + + # Script logic to prep the tarball for building + prepScript: null + + # Whether or not to build online + runOnline: null + + # Directory to build the tarball in + tarballDir: + + # Resource id of the tarball to download and build + tarballResourceId: null + +steps: + - download: ${{ parameters.tarballResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then + resourceIdPathSegment='${{ parameters.tarballResourceId }}/' + fi + + mkdir -p "${{ parameters.tarballDir }}" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: ${{ parameters.prepScript }} + displayName: Prep Tarball + + - script: | + set -x + df -h + + networkArgs= + customBuildArgs= + if [ '${{ parameters.runOnline}}' = 'true' ]; then + customBuildArgs='--online' + else + networkArgs='--network none' + fi + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true + displayName: Build Tarball + + - script: | + set -x + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + displayName: Run Tests + + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml + parameters: + sourceFolder: ${{ parameters.tarballDir }} + + - publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts From 4c3838b1d574679bd61cd76099c81dec1d287b54 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 17 Nov 2021 14:08:28 -0800 Subject: [PATCH 080/239] Update Windows SDK projection --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57ae4fd2d..953d16ee6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.21 - 10.0.18362.21 - 10.0.19041.21 - 10.0.20348.21 - 10.0.22000.21 + 10.0.17763.22 + 10.0.18362.22 + 10.0.19041.22 + 10.0.20348.22 + 10.0.22000.22 From b3e2d06a4ea6f2af29d7c2f276414704eb956e00 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 17 Nov 2021 14:09:53 -0800 Subject: [PATCH 081/239] Update Windows SDK projection --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57ae4fd2d..953d16ee6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.21 - 10.0.18362.21 - 10.0.19041.21 - 10.0.20348.21 - 10.0.22000.21 + 10.0.17763.22 + 10.0.18362.22 + 10.0.19041.22 + 10.0.20348.22 + 10.0.22000.22 From 565f3e39b0f714127dc18a1f4f0b59696833343a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 23:46:19 +0000 Subject: [PATCH 082/239] Update dependencies from https://github.com/dotnet/sdk build 20211117.19 (#12700) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21566.4 to 7.0.100-1.21567.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57b489e78..ac0b82667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 589443cbb9d229cbda709306b8ac1ba0423e9b6d + c4406d3fc7c61d837cb12e0b93d9b092f8dda856 - + https://github.com/dotnet/sdk - 589443cbb9d229cbda709306b8ac1ba0423e9b6d + c4406d3fc7c61d837cb12e0b93d9b092f8dda856 @@ -131,9 +131,9 @@ a75faf902a1a5adeb6efbf8e392795c8f7e7f94c - + https://github.com/dotnet/linker - d2febca97dc6d3b1ea9f3ea58d87c10276b92a77 + 57574f1178ea4489ca207ae8d87197a20b8ae78e linker diff --git a/eng/Versions.props b/eng/Versions.props index 78c4f0c51..d0faa7df6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21567.14 - 7.0.100-alpha.1.21567.14 + 7.0.100-alpha.1.21567.19 + 7.0.100-alpha.1.21567.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce56d32622b9811a21413d2c50156eb633c91784 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 17 Nov 2021 16:45:06 -0800 Subject: [PATCH 083/239] Exclude ASP.NET runtime packs from Android --- src/redist/targets/GenerateBundledVersions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 89eddb755..676485110 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -370,6 +370,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackExcludedRuntimeIdentifiers="android" /> Date: Thu, 18 Nov 2021 03:48:49 +0000 Subject: [PATCH 084/239] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12689) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211115-01 to 17.1.0-preview-20211116-03 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21565-02 to 17.1.0-preview-21567-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 3d5e4b0fb..456608e04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - b65a2ba4560e2703f24f9a27413e702f3c2af956 + 49c0c89b19b334ee999ba43116db1ec3ed725732 - + https://github.com/dotnet/sdk - b65a2ba4560e2703f24f9a27413e702f3c2af956 + 49c0c89b19b334ee999ba43116db1ec3ed725732 @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - a413f44a4cba32e6c428cdad33a1b7f7789e7648 + 011aeee4d491580dfe11477b89696829061a2d9c @@ -146,9 +146,9 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - 233c037aa97b18982d34d26976e87c677bb013e8 + 7434b575d12157ef98aeaad3b86c8f235f551c41 diff --git a/eng/Versions.props b/eng/Versions.props index 1ca8df7c7..0a9c98b8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21566.12 - 6.0.200-preview.21566.12 + 6.0.200-preview.21567.21 + 6.0.200-preview.21567.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211115-01 + 17.1.0-preview-20211116-03 From 5466891cbb34afd86650140bb0421357bd29622c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 Nov 2021 22:12:40 -0600 Subject: [PATCH 085/239] Update dotnet toolset used in source-build (#12701) --- 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 a9d0ed4c6..0007b6c6e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20" + "dotnet": "6.0.100" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 5e97c0ec155d7a5bcd90873f10b0798f869cd80f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 04:53:18 +0000 Subject: [PATCH 086/239] Update dependencies from https://github.com/dotnet/sdk build 20211117.24 (#12703) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac0b82667..4b3d00422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db - + https://github.com/dotnet/aspnetcore - 0bcacc81d6dada22bd8e0782e86bc94a669d544f + a23e11c06d2f43689efce539ba5218406ecce8db https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - c4406d3fc7c61d837cb12e0b93d9b092f8dda856 + 645bd4ca0f183de8e693ed8027fabedae21b53c7 - + https://github.com/dotnet/sdk - c4406d3fc7c61d837cb12e0b93d9b092f8dda856 + 645bd4ca0f183de8e693ed8027fabedae21b53c7 diff --git a/eng/Versions.props b/eng/Versions.props index d0faa7df6..8b3d6c761 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21566.6 - 7.0.0-alpha.1.21566.6 - 7.0.0-alpha.1.21566.6 - 7.0.0-alpha.1.21566.6 - 7.0.0-alpha.1.21566.6 - 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.12 0.2.0 - 7.0.100-alpha.1.21567.19 - 7.0.100-alpha.1.21567.19 + 7.0.100-alpha.1.21567.24 + 7.0.100-alpha.1.21567.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99379b2c643c8830b479bdc3fe421825d5de984f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 11:11:16 +0000 Subject: [PATCH 087/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.1 (#12704) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b3d00422..0ce5dc8cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 - + https://github.com/dotnet/aspnetcore - a23e11c06d2f43689efce539ba5218406ecce8db + f993b272df3187500f5afef52dc9a726118cfbc0 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 0149114263d468d067fc52d0e56143f06a4c2653 - + https://github.com/dotnet/sdk - 645bd4ca0f183de8e693ed8027fabedae21b53c7 + a4de85a7269e461e11fa1df90e9929bea7ac6be9 - + https://github.com/dotnet/sdk - 645bd4ca0f183de8e693ed8027fabedae21b53c7 + a4de85a7269e461e11fa1df90e9929bea7ac6be9 diff --git a/eng/Versions.props b/eng/Versions.props index 8b3d6c761..f1c6bb16b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21567.12 - 7.0.0-alpha.1.21567.12 - 7.0.0-alpha.1.21567.12 - 7.0.0-alpha.1.21567.12 - 7.0.0-alpha.1.21567.12 - 7.0.0-alpha.1.21567.12 + 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21567.15 0.2.0 - 7.0.100-alpha.1.21567.24 - 7.0.100-alpha.1.21567.24 + 7.0.100-alpha.1.21568.1 + 7.0.100-alpha.1.21568.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0be32136246da4eebf7be77eeece51a5e9d16e11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:13:16 +0000 Subject: [PATCH 088/239] [main] Update dependencies from dotnet/sdk (#12705) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21566.1 to 7.0.100-alpha.1.21568.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21566.1 to 7.0.100-alpha.1.21568.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 0ce5dc8cc..1d8096a59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/templating - 0149114263d468d067fc52d0e56143f06a4c2653 + 59604ad70c3d878b6879219b5cd32707e006849d - + https://github.com/dotnet/templating - 0149114263d468d067fc52d0e56143f06a4c2653 + 59604ad70c3d878b6879219b5cd32707e006849d - + https://github.com/dotnet/sdk - a4de85a7269e461e11fa1df90e9929bea7ac6be9 + d0b878cda599fe388dda95c30bcd0be05dc4b2a3 - + https://github.com/dotnet/sdk - a4de85a7269e461e11fa1df90e9929bea7ac6be9 + d0b878cda599fe388dda95c30bcd0be05dc4b2a3 diff --git a/eng/Versions.props b/eng/Versions.props index f1c6bb16b..fda0e2ba7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 7.0.100-alpha.1.21566.1 + 7.0.100-alpha.1.21568.3 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21568.1 - 7.0.100-alpha.1.21568.1 + 7.0.100-alpha.1.21568.3 + 7.0.100-alpha.1.21568.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a5396ecf62c44e8775f4823825b35dcc5cbe4eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:30:44 +0000 Subject: [PATCH 089/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.4 (#12707) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.3 to 7.0.100-alpha.1.21568.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.3 to 7.0.100-alpha.1.21568.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 1d8096a59..76d464d08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 9844984f8118380856a6f8e247cdb7f496408cd2 - + https://github.com/dotnet/templating - 59604ad70c3d878b6879219b5cd32707e006849d + 41c976b056ee37235f37df41d971e025d6519ec9 - + https://github.com/dotnet/templating - 59604ad70c3d878b6879219b5cd32707e006849d + 41c976b056ee37235f37df41d971e025d6519ec9 - + https://github.com/dotnet/sdk - d0b878cda599fe388dda95c30bcd0be05dc4b2a3 + f3e66137c2be5a03fbcf51b4e945c68580fc6505 - + https://github.com/dotnet/sdk - d0b878cda599fe388dda95c30bcd0be05dc4b2a3 + f3e66137c2be5a03fbcf51b4e945c68580fc6505 diff --git a/eng/Versions.props b/eng/Versions.props index fda0e2ba7..bd5dcb64f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 7.0.100-alpha.1.21568.3 + 7.0.100-alpha.1.21568.4 @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21568.3 - 7.0.100-alpha.1.21568.3 + 7.0.100-alpha.1.21568.4 + 7.0.100-alpha.1.21568.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d87160a67cbc6af43e2960e63cc9e3261c52d06 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 18 Nov 2021 13:57:14 -0600 Subject: [PATCH 090/239] Remove 2.1 templates from dynamic templates (#12511) --- src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index 51ddce047..89142c504 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -12,8 +12,7 @@ --> @@ -26,7 +25,6 @@ - From fee5226d8fab608303674d35a15f0e1ccd337a62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 22:31:00 +0000 Subject: [PATCH 091/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.8 (#12709) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211118-03 (parent: Microsoft.NET.Sdk) --- 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 76d464d08..fd12cb87d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 41c976b056ee37235f37df41d971e025d6519ec9 - + https://github.com/dotnet/sdk - f3e66137c2be5a03fbcf51b4e945c68580fc6505 + 10a7a911244e0c77914113fe4804b4f550380a31 - + https://github.com/dotnet/sdk - f3e66137c2be5a03fbcf51b4e945c68580fc6505 + 10a7a911244e0c77914113fe4804b4f550380a31 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - a75faf902a1a5adeb6efbf8e392795c8f7e7f94c + efb84220a100157d0a9b97ded93af240d1da8936 diff --git a/eng/Versions.props b/eng/Versions.props index bd5dcb64f..29350e2cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21568.4 - 7.0.100-alpha.1.21568.4 + 7.0.100-alpha.1.21568.8 + 7.0.100-alpha.1.21568.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211117-01 + 17.1.0-preview-20211118-03 From 5ca6fe56ab40c1a1e1152ad318f0329d526ccf0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 23:42:56 +0000 Subject: [PATCH 092/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.9 (#12710) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd12cb87d..06216cb78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 10e107debae28de4bd1e710cfe448be3c293e841 - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b - + https://github.com/dotnet/aspnetcore - f993b272df3187500f5afef52dc9a726118cfbc0 + ad46e0355613b8cfca9d401a44d9eba7004a175b https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 41c976b056ee37235f37df41d971e025d6519ec9 - + https://github.com/dotnet/sdk - 10a7a911244e0c77914113fe4804b4f550380a31 + 5e0c0ef1965cedefffa9fb2370e0a0cf259f2597 - + https://github.com/dotnet/sdk - 10a7a911244e0c77914113fe4804b4f550380a31 + 5e0c0ef1965cedefffa9fb2370e0a0cf259f2597 diff --git a/eng/Versions.props b/eng/Versions.props index 29350e2cf..5736bb22c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 7.0.0-alpha.1.21567.15 - 7.0.0-alpha.1.21567.15 - 7.0.0-alpha.1.21567.15 - 7.0.0-alpha.1.21567.15 - 7.0.0-alpha.1.21567.15 - 7.0.0-alpha.1.21567.15 + 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21568.1 0.2.0 - 7.0.100-alpha.1.21568.8 - 7.0.100-alpha.1.21568.8 + 7.0.100-alpha.1.21568.9 + 7.0.100-alpha.1.21568.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3572a50e211746338d588eb1b52a1e125f451cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 00:13:35 +0000 Subject: [PATCH 093/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.12 (#12712) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 456608e04..62af050ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 49c0c89b19b334ee999ba43116db1ec3ed725732 + 287f35ebd0e934f8a1769dbe4ef648089e8430c8 - + https://github.com/dotnet/sdk - 49c0c89b19b334ee999ba43116db1ec3ed725732 + 287f35ebd0e934f8a1769dbe4ef648089e8430c8 diff --git a/eng/Versions.props b/eng/Versions.props index 0a9c98b8f..889865a1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21567.21 - 6.0.200-preview.21567.21 + 6.0.200-preview.21568.12 + 6.0.200-preview.21568.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f6daa460d9a3190b747f2a0913a845289d0753 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 01:14:17 +0000 Subject: [PATCH 094/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.15 (#12713) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21561.4 to 4.0.1-1.21568.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06216cb78..8f66eaf89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 41c976b056ee37235f37df41d971e025d6519ec9 - + https://github.com/dotnet/sdk - 5e0c0ef1965cedefffa9fb2370e0a0cf259f2597 + cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c - + https://github.com/dotnet/sdk - 5e0c0ef1965cedefffa9fb2370e0a0cf259f2597 + cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c @@ -137,9 +137,9 @@ linker - + https://github.com/dotnet/roslyn - add472bbed002fcea9232e89793d0762cc71c5cf + 6ab6601178d9fba8c680b56934cd1742e0816bff diff --git a/eng/Versions.props b/eng/Versions.props index 5736bb22c..a88448cf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 7.0.100-alpha.1.21568.9 - 7.0.100-alpha.1.21568.9 + 7.0.100-alpha.1.21568.15 + 7.0.100-alpha.1.21568.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbc6079a4c6b2cee3b27080ef17d34dfacddb8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 01:46:35 +0000 Subject: [PATCH 095/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.17 (#12714) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 62af050ee..6094e8a68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 287f35ebd0e934f8a1769dbe4ef648089e8430c8 + 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 - + https://github.com/dotnet/sdk - 287f35ebd0e934f8a1769dbe4ef648089e8430c8 + 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 diff --git a/eng/Versions.props b/eng/Versions.props index 889865a1c..310913eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.12 - 6.0.200-preview.21568.12 + 6.0.200-preview.21568.17 + 6.0.200-preview.21568.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 636ee9cff9e5f832dac3dfb5f2a9b92c00018ce7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 03:38:17 +0000 Subject: [PATCH 096/239] Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk) --- 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 6094e8a68..16c5809e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 + a780470224c8082961d12608542c32c848564fcf - + https://github.com/dotnet/sdk - 07a4696dba016ed0d06805f9ed8ad9c2537c7df5 + a780470224c8082961d12608542c32c848564fcf @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - 011aeee4d491580dfe11477b89696829061a2d9c + a75faf902a1a5adeb6efbf8e392795c8f7e7f94c diff --git a/eng/Versions.props b/eng/Versions.props index 310913eef..f91639b76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.17 - 6.0.200-preview.21568.17 + 6.0.200-preview.21568.19 + 6.0.200-preview.21568.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211116-03 + 17.1.0-preview-20211117-01 From 369971d1711abeb8987d9975a434161609750125 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 14:20:33 +0000 Subject: [PATCH 097/239] Update dependencies from https://github.com/dotnet/arcade build 20211118.2 (#12717) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.1-beta-21565-01 to 1.1.1-beta-21566-01 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f66eaf89..845fb6b2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,26 +172,26 @@ - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f https://github.com/dotnet/source-build-reference-packages fc184172bf8144f7c91a7bc0226b7d90c5821576 - + https://github.com/dotnet/sourcelink 4f4f58596278e9ef72d68d7ea80b634e552c9c8f diff --git a/eng/Versions.props b/eng/Versions.props index a88448cf8..7216d11f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21566.10 + 7.0.0-beta.21568.2 diff --git a/global.json b/global.json index 0e78a837f..f7384f565 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.21566.10", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21566.10" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21568.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21568.2" } } From 08f2244ae070daceea963ae39e0902b0ec923e60 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 19 Nov 2021 13:34:59 -0800 Subject: [PATCH 098/239] Update the test to target current and 5.0 --- test/EndToEnd/ProjectBuildTests.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index cdc39d3e6..78b94734c 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -98,13 +98,18 @@ namespace EndToEnd.Tests [WindowsOnlyTheory] [InlineData("net5.0")] - [InlineData("net6.0")] + [InlineData("current")] public void ItCanPublishArm64Winforms(string TargetFramework) { DirectoryInfo directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; + string TargetFrameworkParameter = ""; - string newArgs = $"winforms -f {TargetFramework} --no-restore"; + if (TargetFramework != "current") + { + TargetFrameworkParameter = $"-f {TargetFramework}" + } + string newArgs = $"winforms {TargetFrameworkParameter} --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) @@ -126,13 +131,19 @@ namespace EndToEnd.Tests [WindowsOnlyTheory] [InlineData("net5.0")] - [InlineData("net6.0")] + [InlineData("current")] public void ItCanPublishArm64Wpf(string TargetFramework) { DirectoryInfo directory = TestAssets.CreateTestDirectory(); string projectDirectory = directory.FullName; + string TargetFrameworkParameter = ""; - string newArgs = $"wpf -f {TargetFramework} --no-restore"; + if (TargetFramework != "current") + { + TargetFrameworkParameter = $"-f {TargetFramework}" + } + + string newArgs = $"wpf {TargetFrameworkParameter} --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) From 53515c68e7feee23d47625ea49cc847ddeaa7dd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Nov 2021 14:20:12 +0000 Subject: [PATCH 099/239] Update dependencies from https://github.com/dotnet/arcade build 20211119.2 (#12719) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.sh | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 845fb6b2d..8d22d37f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7216d11f2..f9bfade26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21568.2 + 7.0.0-beta.21569.2 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..84c1d0cc2 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -53,7 +53,7 @@ fi function InstallDarcCli { local darc_cli_package_name="microsoft.dotnet.darc" - InitializeDotNetCli + InitializeDotNetCli true local dotnet_root=$_InitializeDotNetCli if [ -z "$toolpath" ]; then diff --git a/global.json b/global.json index f7384f565..85f7c0242 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.21568.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21568.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21569.2" } } From 0f7cff6396b5c4dcebd3970749789d2de343e4fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:14:44 +0000 Subject: [PATCH 100/239] Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (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 16c5809e1..8fd1c83bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + f1a2b70faf2ff4d95a82bc68433ee934e51b4cde - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + f1a2b70faf2ff4d95a82bc68433ee934e51b4cde https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - a780470224c8082961d12608542c32c848564fcf + cfe580de7c4d4c78f3ad364bfe48a3411dd51326 - + https://github.com/dotnet/sdk - a780470224c8082961d12608542c32c848564fcf + cfe580de7c4d4c78f3ad364bfe48a3411dd51326 @@ -130,9 +130,9 @@ 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 - + https://github.com/microsoft/vstest - a75faf902a1a5adeb6efbf8e392795c8f7e7f94c + d9060f58f36e67fd65527c585a0a0fdaf56e954e diff --git a/eng/Versions.props b/eng/Versions.props index f91639b76..1f6088c03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100 + 6.0.200-alpha.1.21568.2 @@ -56,8 +56,8 @@ - 6.0.200-preview.21568.19 - 6.0.200-preview.21568.19 + 6.0.200-preview.21571.3 + 6.0.200-preview.21571.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211117-01 + 17.1.0-preview-20211119-03 From 93918d953f0b9cbd225f2385c0708d3f3ef37cf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 20:07:54 +0000 Subject: [PATCH 101/239] Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.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 8fd1c83bb..0edf85451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - f1a2b70faf2ff4d95a82bc68433ee934e51b4cde + 3cdf2180028076da6f06f4da4b8767e33da92157 - + https://github.com/dotnet/templating - f1a2b70faf2ff4d95a82bc68433ee934e51b4cde + 3cdf2180028076da6f06f4da4b8767e33da92157 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - cfe580de7c4d4c78f3ad364bfe48a3411dd51326 + aa3f5cfbb4897828544599893dcb1fefef4f74d0 - + https://github.com/dotnet/sdk - cfe580de7c4d4c78f3ad364bfe48a3411dd51326 + aa3f5cfbb4897828544599893dcb1fefef4f74d0 diff --git a/eng/Versions.props b/eng/Versions.props index 1f6088c03..06c630afa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21568.2 + 6.0.200-alpha.1.21572.3 @@ -56,8 +56,8 @@ - 6.0.200-preview.21571.3 - 6.0.200-preview.21571.3 + 6.0.200-preview.21572.10 + 6.0.200-preview.21572.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d075c8fec274e5dc9e9ed36e53d86f4a7249b5a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 22 Nov 2021 13:05:25 -0800 Subject: [PATCH 102/239] Fix typo --- test/EndToEnd/ProjectBuildTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 78b94734c..4413f2973 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -107,7 +107,7 @@ namespace EndToEnd.Tests if (TargetFramework != "current") { - TargetFrameworkParameter = $"-f {TargetFramework}" + TargetFrameworkParameter = $"-f {TargetFramework}"; } string newArgs = $"winforms {TargetFrameworkParameter} --no-restore"; new NewCommandShim() @@ -140,7 +140,7 @@ namespace EndToEnd.Tests if (TargetFramework != "current") { - TargetFrameworkParameter = $"-f {TargetFramework}" + TargetFrameworkParameter = $"-f {TargetFramework}"; } string newArgs = $"wpf {TargetFrameworkParameter} --no-restore"; From cf0d1025ac57e013c866372475652a47729cf764 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 22 Nov 2021 23:58:17 +0000 Subject: [PATCH 103/239] Resolve source-build patch conflict --- .../0001-Remove-uneeded-source-build-patches-and-re-patch.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 36ce5217c..34d37ba0b 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644 @@ -33,7 +34,7 @@ - + - From 0b0e761068f634647dc2d122cf0478660b978004 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:05:13 +0000 Subject: [PATCH 104/239] Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0edf85451..357748a4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - aa3f5cfbb4897828544599893dcb1fefef4f74d0 + b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c - + https://github.com/dotnet/sdk - aa3f5cfbb4897828544599893dcb1fefef4f74d0 + b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 + 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/dotnet/fsharp - 8bdf7ac23d71d62731dbc0226ee022e5f11a0645 + 44e285721013feeedfa140298ea9f172a0c6fd70 diff --git a/eng/Versions.props b/eng/Versions.props index 06c630afa..46e02f8b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21572.10 - 6.0.200-preview.21572.10 + 6.0.200-preview.21573.1 + 6.0.200-preview.21573.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79f2c912848c4677b55f2328e199e9662aefe129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:56:03 +0000 Subject: [PATCH 105/239] Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (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 357748a4b..74a8c330a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c + 448f9bdeb40789a50405eb4249db0ccd1a764b04 - + https://github.com/dotnet/sdk - b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c + 448f9bdeb40789a50405eb4249db0ccd1a764b04 @@ -130,9 +130,9 @@ 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/microsoft/vstest - d9060f58f36e67fd65527c585a0a0fdaf56e954e + 253c1efaa0adfcbc9b4b31de736d5fe2cbf27582 @@ -146,9 +146,9 @@ c7d6f9fab845ffd943216da465022744e7d35f22 - + https://github.com/dotnet/msbuild - 7434b575d12157ef98aeaad3b86c8f235f551c41 + 513f59ce49ffd8adc333dabf70501ad68630348d diff --git a/eng/Versions.props b/eng/Versions.props index 46e02f8b4..eb6240de7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.1 - 6.0.200-preview.21573.1 + 6.0.200-preview.21573.2 + 6.0.200-preview.21573.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211119-03 + 17.1.0-preview-20211122-02 From a2bb0dde82022f7308b0204539c534e731e2f486 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 17:57:30 +0000 Subject: [PATCH 106/239] Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 74a8c330a..c857dc480 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 448f9bdeb40789a50405eb4249db0ccd1a764b04 + 6d13c6babe527bcfbaca00f340581a1b1a72087c - + https://github.com/dotnet/sdk - 448f9bdeb40789a50405eb4249db0ccd1a764b04 + 6d13c6babe527bcfbaca00f340581a1b1a72087c diff --git a/eng/Versions.props b/eng/Versions.props index eb6240de7..b1f55cf0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.2 - 6.0.200-preview.21573.2 + 6.0.200-preview.21573.4 + 6.0.200-preview.21573.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22c7274ec7351ff94228faca16ff9ec291b06888 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 14:15:59 +0000 Subject: [PATCH 107/239] Update dependencies from https://github.com/dotnet/arcade build 20211123.3 (#12728) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.sh | 4 ---- eng/common/native/init-compiler.sh | 2 +- eng/common/sdk-task.ps1 | 3 --- eng/common/templates/job/job.yml | 1 + eng/common/tools.ps1 | 21 --------------------- eng/common/tools.sh | 7 ------- global.json | 4 ++-- 9 files changed, 11 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d22d37f4..106bfd07d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f9bfade26..fb672ad2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21569.2 + 7.0.0-beta.21573.3 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c68..55b298f16 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,10 +187,6 @@ function InitializeCustomToolset { } function Build { - - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 8c944f30b..03a996062 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then fi if [[ "$compiler" == "clang" ]]; then - if command -v "lld$desired_version" > /dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then # Only lld version >= 9 can be considered stable if [[ "$majorVersion" -ge 9 ]]; then LDFLAGS="-fuse-ld=lld" diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5..b1bca63ab 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 37dceb1ba..7678b94ce 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -114,6 +114,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 90b1f9fdc..f1e1cb539 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index dd7030ff5..e555c3426 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -405,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index 85f7c0242..52243d53b 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.21569.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21569.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21573.3" } } From 6d8b7083a9e758ac84f6a7f6c52b77bb1664b5e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 15:00:13 +0000 Subject: [PATCH 108/239] Update dependencies from https://github.com/dotnet/arcade build 20211124.3 (#12729) [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 106bfd07d..c9cfb2fbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fb672ad2b..67a4e3370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21573.3 + 7.0.0-beta.21574.3 diff --git a/global.json b/global.json index 52243d53b..5fad64b2c 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.21573.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21573.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21574.3" } } From 33a8b886da52656e9a32a4faa3d1339a5dd55b98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 14:15:30 +0000 Subject: [PATCH 109/239] Update dependencies from https://github.com/dotnet/arcade build 20211126.2 (#12732) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 10 ++++------ global.json | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9cfb2fbf..977ed9698 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 67a4e3370..e0e55c4bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21574.3 + 7.0.0-beta.21576.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 03a996062..fd1d080e2 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then exit 1 fi -if [[ "$compiler" == "clang" ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then - # Only lld version >= 9 can be considered stable - if [[ "$majorVersion" -ge 9 ]]; then - LDFLAGS="-fuse-ld=lld" - fi +# Only lld version >= 9 can be considered stable +if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then + if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index 5fad64b2c..8ef9ee947 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.21574.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21574.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.2" } } From 7cd8903303ba530aa4ec603890f1c648337fb733 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Nov 2021 14:22:43 +0000 Subject: [PATCH 110/239] Update dependencies from https://github.com/dotnet/arcade build 20211126.4 (#12733) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 3 ++- global.json | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 977ed9698..53e021e18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e0e55c4bd..c42519273 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21576.2 + 7.0.0-beta.21576.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index fd1d080e2..e361e03fa 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,6 +2,7 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." @@ -113,7 +114,7 @@ fi # Only lld version >= 9 can be considered stable if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index 8ef9ee947..8fb5a2f42 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.21576.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.4" } } From 2ee0e6d76e7f886c62b2a5594d7b8400855c703c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 29 Nov 2021 08:43:14 -0600 Subject: [PATCH 111/239] source-build patches needed to get 6.0.2xx building (#12718) * source-build patches needed to get 6.0.2xx building * Patch to address msbuild prebuilts * Remove conflicting backported patch * Additional patches * Additional vstest patch * Workaround dev-cert issue in smoke-tests --- src/SourceBuild/tarball/content/smoke-test.sh | 5 +- ...2-Update-system-command-line-version.patch | 164 ++++++++++++++++++ ...tem.Threading.Tasks.DataFlow-version.patch | 28 +++ ...oject-target-frameworks-for-source-b.patch | 41 +++++ 4 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch create mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index fc034fecc..b3815b840 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk- VERSION_PREFIX=6.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 +DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1 __ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive executingUserHome=${HOME:-} @@ -49,7 +49,8 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -excludeWebHttpsTests=false +# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. +excludeWebHttpsTests=true excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch new file mode 100644 index 000000000..4d5554a71 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -0,0 +1,164 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 19 Nov 2021 13:50:52 -0600 +Subject: [PATCH] Update system-command-line version + +Backported with https://github.com/dotnet/format/pull/1436 +--- + eng/Version.Details.xml | 8 ++++---- + eng/Versions.props | 4 ++-- + src/Commands/FormatAnalyzersCommand.cs | 4 ++-- + src/Commands/FormatCommandCommon.cs | 12 ++++++------ + src/Commands/FormatStyleCommand.cs | 4 ++-- + src/Commands/RootFormatCommand.cs | 4 ++-- + 6 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 48b181b..68c0b43 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -5,13 +5,13 @@ + https://github.com/dotnet/roslyn + 95b7a0198f8c805b367f17e4639020ec21c16705 + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2758207..6a02917 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,8 +18,8 @@ + + 4.0.0-6.21515.3 + +- 2.0.0-beta1.21473.1 +- 0.3.0-alpha.21473.1 ++ 2.0.0-beta1.21525.1 ++ 0.3.0-alpha.21525.1 + + - 1.0.2-beta4.21565.1 - 1.0.2-beta4.21565.1 + 1.0.2-beta4.21579.1 + 1.0.2-beta4.21579.1 @@ -146,7 +146,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21565.1 + 1.0.2-beta4.21579.1 2.1.30 From f8e115fadf6e8b392fa007e78d9b77fc64590cdd Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 29 Nov 2021 20:19:30 -0800 Subject: [PATCH 113/239] Don't set ulimit 1ES pools should now have ulimit set already now --- build.sh | 4 +--- run-build.sh | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 594a355fa..7ff647c40 100755 --- a/build.sh +++ b/build.sh @@ -53,7 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - # Run under sudo so we can set ulimit - # See https://github.com/dotnet/core-eng/issues/14808 - sudo -E $DIR/run-build.sh $args + $DIR/run-build.sh $args fi diff --git a/run-build.sh b/run-build.sh index fe839eb80..7b98aedc0 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,10 +25,6 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" -# Set max number of files open, helps avoid errors during NuGet restore -# See https://github.com/dotnet/core-eng/issues/14808 -ulimit -n 16384 - args=( ) while [[ $# > 0 ]]; do From 4de9a9898183d9531dd0f9e9ed80f3664c2e782f Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 30 Nov 2021 11:33:41 -0800 Subject: [PATCH 114/239] [automated] Merge branch 'release/6.0.2xx' => 'main' (#12734) * Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726) [release/6.0.2xx] Update dependencies from dotnet/sdk * source-build patches needed to get 6.0.2xx building (#12718) * source-build patches needed to get 6.0.2xx building * Patch to address msbuild prebuilts * Remove conflicting backported patch * Additional patches * Additional vstest patch * Workaround dev-cert issue in smoke-tests Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Jason Zhai --- src/SourceBuild/tarball/content/smoke-test.sh | 5 +- ...2-Update-system-command-line-version.patch | 164 ++++++++++++++++++ ...tem.Threading.Tasks.DataFlow-version.patch | 28 +++ ...oject-target-frameworks-for-source-b.patch | 41 +++++ 4 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch create mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 334aa8064..54405ac5e 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk- VERSION_PREFIX=6.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 +DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1 __ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive executingUserHome=${HOME:-} @@ -48,7 +48,8 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -excludeWebHttpsTests=false +# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. +excludeWebHttpsTests=true excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch new file mode 100644 index 000000000..4d5554a71 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -0,0 +1,164 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 19 Nov 2021 13:50:52 -0600 +Subject: [PATCH] Update system-command-line version + +Backported with https://github.com/dotnet/format/pull/1436 +--- + eng/Version.Details.xml | 8 ++++---- + eng/Versions.props | 4 ++-- + src/Commands/FormatAnalyzersCommand.cs | 4 ++-- + src/Commands/FormatCommandCommon.cs | 12 ++++++------ + src/Commands/FormatStyleCommand.cs | 4 ++-- + src/Commands/RootFormatCommand.cs | 4 ++-- + 6 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 48b181b..68c0b43 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -5,13 +5,13 @@ + https://github.com/dotnet/roslyn + 95b7a0198f8c805b367f17e4639020ec21c16705 + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2758207..6a02917 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,8 +18,8 @@ + + 4.0.0-6.21515.3 + +- 2.0.0-beta1.21473.1 +- 0.3.0-alpha.21473.1 ++ 2.0.0-beta1.21525.1 ++ 0.3.0-alpha.21525.1 + + - 6.0.100-rc.1.1351 - 30.0.100-rc.1.137 - 15.0.100-rc.1.496 - 15.0.100-rc.1.496 - 12.0.100-rc.1.496 - 15.0.100-rc.1.496 + 6.0.101-preview.9.1805 + 31.0.101-preview.9.16 + 15.0.101-preview.9.31 + 15.0.101-preview.9.31 + 12.0.101-preview.9.31 + 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) 7.0.0-alpha.1.21560.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 84fd6c272a16344be44f4c889b3efdbc86f4e0f5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 2 Dec 2021 16:46:53 -0800 Subject: [PATCH 119/239] Don't try to validate signing for workload manifests that will be signed as part of post-build signing --- src/redist/targets/BundledManifests.targets | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 516ce70b1..e56e1af3f 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -51,7 +51,12 @@ - + + + + true true - $([MSBuild]::Subtract($(MajorVersion), 1)).0.0 + $(NetCoreAppLatestStablePackageBaselineVersion) From 9df348884d6ef95d95e65632f4019715138544a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 16:29:58 -0600 Subject: [PATCH 121/239] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12727) * Update dependencies from https://github.com/dotnet/sdk build 20211123.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.8 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-21572-15 -> To Version 17.1.0-preview-21573-03 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211123.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211123.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.12 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211123.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.18 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.2 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.15 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.15 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.17 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211124.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.18 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211125.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211125.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.7 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211125.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.9 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211125.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211126.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211126.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.2 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211128.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21578.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211126-02 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20211129.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.3 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211129.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.6 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211129.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.10 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211130.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211130.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.3 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211130.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.9 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211130.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211201.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.3 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211201.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.7 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211130-04 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 24 +++++++------- eng/Versions.props | 6 ++-- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 17 +--------- ...e-powered-source-build-patches-55823.patch | 33 ------------------- ...st-build-of-csi-vbi-for-source-build.patch | 4 +-- 5 files changed, 18 insertions(+), 66 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c857dc480..fa0fcb268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 6d13c6babe527bcfbaca00f340581a1b1a72087c + 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 - + https://github.com/dotnet/sdk - 6d13c6babe527bcfbaca00f340581a1b1a72087c + 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 @@ -130,9 +130,9 @@ 44e285721013feeedfa140298ea9f172a0c6fd70 - + https://github.com/microsoft/vstest - 253c1efaa0adfcbc9b4b31de736d5fe2cbf27582 + 7f3499467c833d54d1e100d33d2ee54455112bd2 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - c7d6f9fab845ffd943216da465022744e7d35f22 + 1073bc6ce7a0eb08968656e10042970d2f7b3b1d - + https://github.com/dotnet/msbuild - 513f59ce49ffd8adc333dabf70501ad68630348d + 23940013c60c33c183e52547ce6ca535b6689d4c - + https://github.com/nuget/nuget.client - a998efecd431ec8a41536b5ac0152c16f1e2e646 + c14b85a00c03933c708c7d38fefeda9898a21488 diff --git a/eng/Versions.props b/eng/Versions.props index b1f55cf0c..54c72d104 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21573.4 - 6.0.200-preview.21573.4 + 6.0.200-preview.21601.7 + 6.0.200-preview.21601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211122-02 + 17.1.0-preview-20211130-04 diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 80f65c174..b82c812ab 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -7,28 +7,13 @@ Removes prebuilts. Background Issue: https://github.com/dotnet/source-build/issues/2542 --- - eng/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- src/Samples/Directory.Build.props | 1 + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 6 files changed, 9 insertions(+), 7 deletions(-) + 5 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/eng/Packages.props b/eng/Packages.props -index 494c9c0..7689042 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -46,9 +46,6 @@ - - - -- -- -- - - - diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch deleted file mode 100644 index 8e3884438..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 19 Oct 2021 11:39:32 -0500 -Subject: [PATCH] Apply arcade-powered source-build patches (#55823) - -Don't include desktop artifacts that don't exist in source-build. -Source-build doesn't have these artifacts available, even when we eventually will -build desktop TFMs, because Roslyn is one of the first builds in source-build. -Instead Roslyn is picking up reference packages that don't have the `lib` directory -which is causing a build failure. This disables the attempt to grab these desktop -artifacts so source-build just skips them instead. - -Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 ---- - .../DesktopCompilerArtifacts.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -index c8b87ab6958..107ff051b51 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -@@ -20,7 +20,7 @@ - VS training data to the assemblies they produce. - --> - -- -+ - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index f94119820..0afe8be53 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644 @@ -6,6 +6,7 @@ Exe CSharpInteractive - netcoreapp3.1;net472 + net6.0;net472 + false @@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644 @@ -6,6 +6,7 @@ Exe Sub Main - netcoreapp3.1;net472 + net6.0;net472 + false From 70024622839f746596e59767f220a41082186ef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 17:03:16 +0000 Subject: [PATCH 122/239] [main] Update dependencies from dotnet/arcade (#12747) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.1-beta-21566-01 to 1.1.1-beta-21579-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Resolve source-build arcade patch conflict --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- .../arcade/0008-Bootstrapping-workaround.patch | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d01f924b5..a75ebdef5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,28 +172,28 @@ - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 https://github.com/dotnet/source-build-reference-packages fc184172bf8144f7c91a7bc0226b7d90c5821576 - + https://github.com/dotnet/sourcelink - 4f4f58596278e9ef72d68d7ea80b634e552c9c8f + 9c298b01ce0f161622bef0bc0c433a758d0dd3ac diff --git a/eng/Versions.props b/eng/Versions.props index 69b9e3393..9c1439974 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21576.4 + 7.0.0-beta.21603.6 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29eb..4585cfd6b 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 3aafc82e4..8128f2c35 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.53.3 + value: 0.109.0 - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - name: GuardianPackagesConfigFile diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e555c3426..17f0a3658 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -178,7 +178,7 @@ function InstallDotNetSdk { if [[ $# -ge 3 ]]; then architecture=$3 fi - InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key + InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key } function InstallDotNet { diff --git a/global.json b/global.json index 8fb5a2f42..0d12f5fd5 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.21576.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21603.6" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch index 5ed742d7b..cfb166328 100644 --- a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch +++ b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch @@ -24,9 +24,9 @@ index 37feef5..c5aee85 100644 + $(NoWarn);NU1603 + + - - - 1.0.2-beta4.21579.1 - 1.0.2-beta4.21579.1 + 1.0.2-beta4.21606.1 + 1.0.2-beta4.21606.1 @@ -146,7 +146,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21579.1 + 1.0.2-beta4.21606.1 2.1.30 From 819d5f47a4ba52899f9f7c4836ae3ee91e8183df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 17:33:48 +0000 Subject: [PATCH 124/239] [main] Update dependencies from dotnet/sdk (#12716) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21566.2 to 7.0.0-alpha.1.21580.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21580.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211118-03 to 17.1.0-preview-20211202-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21567.1 to 7.0.100-1.21601.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21579-12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Try using new dotnetbuilds asset root URI - !fixup! typo - Resolve msbuild source-build patch conflict - Merge branch 'darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Resolve source-build conflicts w/format patches --- eng/Version.Details.xml | 108 ++++++------ eng/Versions.props | 52 +++--- .../0001-Fix-MicrosoftExtensionsVersion.patch | 4 +- ...2-Update-system-command-line-version.patch | 164 ------------------ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 17 +- 5 files changed, 86 insertions(+), 259 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24f6e2235..0c2caad38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 https://github.com/dotnet/test-templates @@ -90,32 +90,32 @@ a27234829e6f68613c9f558bc548539a9cc397bb - + https://github.com/dotnet/templating - 41c976b056ee37235f37df41d971e025d6519ec9 + 9b8b780bf233907ae5d38aaf8c8b769782322735 - + https://github.com/dotnet/templating - 41c976b056ee37235f37df41d971e025d6519ec9 + 9b8b780bf233907ae5d38aaf8c8b769782322735 - + https://github.com/dotnet/sdk - cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c + 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c - + https://github.com/dotnet/sdk - cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c + 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c - + https://github.com/dotnet/winforms - 5a5a7c7874d9a707328d4e69a6fffca1998bc1e3 + 36b637614457bf865679cf2f8730fe0676cc91c2 - + https://github.com/dotnet/wpf - 19b4ef3e3621c1d8252e000d920920fdf64cf858 + 095e51221dd8c9d603cff3eebd23252179350ae7 https://github.com/dotnet/fsharp @@ -126,25 +126,25 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - efb84220a100157d0a9b97ded93af240d1da8936 + 3599fd55bbabfe757db4121b3cd04b8512bd86b7 - + https://github.com/dotnet/linker - 57574f1178ea4489ca207ae8d87197a20b8ae78e + 2914e5a11fa685c2ce90e1ba972c9ac5deea079c linker - + https://github.com/dotnet/roslyn - 6ab6601178d9fba8c680b56934cd1742e0816bff + 1fa6e45dd631b37e7b28a78907240aed8a300d50 - + https://github.com/dotnet/msbuild - 7434b575d12157ef98aeaad3b86c8f235f551c41 + befb72b8adf0a934c94f5cc6be85cf4039f78aea diff --git a/eng/Versions.props b/eng/Versions.props index f9f36e154..b96e8bc9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,21 +18,27 @@ false release + + + + https://dotnetbuilds.blob.core.windows.net/public/ + https://dotnetclimsrc.blob.core.windows.net/dotnet/ + 7.0.0-beta.21603.6 - 7.0.0-alpha.1.21566.2 + 7.0.0-alpha.1.21580.1 - 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21580.3 - 7.0.100-alpha.1.21568.4 + 7.0.100-alpha.1.21601.1 @@ -45,44 +51,44 @@ - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 0.2.0 - 7.0.100-alpha.1.21568.15 - 7.0.100-alpha.1.21568.15 + 7.0.100-alpha.1.21602.1 + 7.0.100-alpha.1.21602.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 2.1.0 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 @@ -153,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211118-03 + 17.1.0-preview-20211202-01 diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..80fb51c59 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -26,7 +26,7 @@ index 6b628c2..9b579ea 100644 - 5.0.0 - 6.0.0-preview.4.221 + 6.0.0-rc.278 @@ -25,9 +24,9 @@ @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch deleted file mode 100644 index 4d5554a71..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 19 Nov 2021 13:50:52 -0600 -Subject: [PATCH] Update system-command-line version - -Backported with https://github.com/dotnet/format/pull/1436 ---- - eng/Version.Details.xml | 8 ++++---- - eng/Versions.props | 4 ++-- - src/Commands/FormatAnalyzersCommand.cs | 4 ++-- - src/Commands/FormatCommandCommon.cs | 12 ++++++------ - src/Commands/FormatStyleCommand.cs | 4 ++-- - src/Commands/RootFormatCommand.cs | 4 ++-- - 6 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 48b181b..68c0b43 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -5,13 +5,13 @@ - https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2758207..6a02917 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -18,8 +18,8 @@ - - 4.0.0-6.21515.3 - -- 2.0.0-beta1.21473.1 -- 0.3.0-alpha.21473.1 -+ 2.0.0-beta1.21525.1 -+ 0.3.0-alpha.21525.1 - - + +- ++ + + + diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props index 6b9d6cd9f..317ef14a6 100644 --- a/src/Samples/Directory.Build.props diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch new file mode 100644 index 000000000..a0133a35f --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rainer Sigwald +Date: Fri, 3 Dec 2021 14:24:03 -0600 +Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) + +This package is only super relevant at PR-build time so it should +be fine to drop it from source-build scenarios. Fixes #7115. + +Patch created from https://github.com/dotnet/msbuild/pull/7118 +--- + src/Directory.Build.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets +index 2a840bfd7..bff6cc905 100644 +--- a/src/Directory.Build.targets ++++ b/src/Directory.Build.targets +@@ -85,7 +85,7 @@ + + + +- ++ + + + From d1d94727f546bb23dba80fc6e19ac8632388ab4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:21:16 +0000 Subject: [PATCH 126/239] Update dependencies from https://github.com/dotnet/sdk build 20211206.5 (#12749) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 fa0fcb268..47a49d499 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 + 31172387ab7b4bffff0291e42757d56a4750b90d - + https://github.com/dotnet/sdk - 69a5d503ce8a54af2a58fc37c0adf3d3794f0801 + 31172387ab7b4bffff0291e42757d56a4750b90d diff --git a/eng/Versions.props b/eng/Versions.props index 54c72d104..05a50313b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21601.7 - 6.0.200-preview.21601.7 + 6.0.200-preview.21606.5 + 6.0.200-preview.21606.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 438991aeba710f86640bd695e44cf894301a65f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 01:46:04 +0000 Subject: [PATCH 127/239] Update dependencies from https://github.com/dotnet/sdk build 20211206.10 (#12752) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 47a49d499..9934f87a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 31172387ab7b4bffff0291e42757d56a4750b90d + 5381a5ba97dbea698e271e0cc4852a094a78672d - + https://github.com/dotnet/sdk - 31172387ab7b4bffff0291e42757d56a4750b90d + 5381a5ba97dbea698e271e0cc4852a094a78672d diff --git a/eng/Versions.props b/eng/Versions.props index 05a50313b..1f41437c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.5 - 6.0.200-preview.21606.5 + 6.0.200-preview.21606.10 + 6.0.200-preview.21606.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b10c4644eaf0a101d7e74161f3e2d60e70bffb04 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 6 Dec 2021 20:50:23 -0600 Subject: [PATCH 128/239] Re-enable web https smoke tests (#12739) --- src/SourceBuild/tarball/content/smoke-test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index f39c285b4..f32e4fa3b 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -49,8 +49,7 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. -excludeWebHttpsTests=true +excludeWebHttpsTests=false excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" From c56d85f7de09f796b000ef5a0c2f82e14296995e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 06:48:30 +0000 Subject: [PATCH 129/239] Update dependencies from https://github.com/dotnet/sdk build 20211206.13 (#12753) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21572.8 to 12.0.1-beta.21606.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21572.8 to 6.0.2-beta.21606.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9934f87a1..a72311e30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d - + https://github.com/dotnet/sdk - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e diff --git a/eng/Versions.props b/eng/Versions.props index 1f41437c6..ea5a46cc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.10 - 6.0.200-preview.21606.10 + 6.0.200-preview.21606.13 + 6.0.200-preview.21606.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa3c69e7580c4bbff69ae90be1d551285f8b9b1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:24:17 +0000 Subject: [PATCH 130/239] Update dependencies from https://github.com/dotnet/arcade build 20211206.6 (#12754) [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 0c2caad38..542387c61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b96e8bc9b..e0a1608c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21603.6 + 7.0.0-beta.21606.6 diff --git a/global.json b/global.json index 0d12f5fd5..eca04b09f 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.21603.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21603.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21606.6" } } From 567091840a4a5b74473debcc7d5d14a33d1edc20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:35:36 +0000 Subject: [PATCH 131/239] Update dependencies from https://github.com/dotnet/sdk build 20211207.2 (#12755) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 a72311e30..fce0214d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 - + https://github.com/dotnet/sdk - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 diff --git a/eng/Versions.props b/eng/Versions.props index ea5a46cc6..c2c8dd95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.13 - 6.0.200-preview.21606.13 + 6.0.200-preview.21607.2 + 6.0.200-preview.21607.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2ba170c3fc83d7a6ac517007054dbe5db669886 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 7 Dec 2021 14:42:00 +0000 Subject: [PATCH 132/239] Source-build patch edits --- .../0007-WebHost-delegate-nullability.patch | 43 ------------------- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 4 +- ...st-build-of-csi-vbi-for-source-build.patch | 4 +- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch deleted file mode 100644 index 426502e86..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 6 Dec 2021 18:39:25 +0000 -Subject: [PATCH] WebHost delegate nullability - -Addresses the following errors: - - src/Hosting/Hosting/src/Internal/WebHost.cs(83,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). - src/Hosting/Hosting/src/Internal/WebHost.cs(86,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). - src/Hosting/Hosting/src/Internal/WebHost.cs(88,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). - -Cherry-pick of WebHost only changes made under https://github.com/dotnet/aspnetcore/commit/13a460820e90c8f3e90eb4fdbbb3de671389bf0c#diff-6ef451f2ae3e04d73dde362bdf9de6b101aef95e3a4f5190e5c96967d683aef9 ---- - src/Hosting/Hosting/src/Internal/WebHost.cs | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs -index ca52bd1f40..643d03e8af 100644 ---- a/src/Hosting/Hosting/src/Internal/WebHost.cs -+++ b/src/Hosting/Hosting/src/Internal/WebHost.cs -@@ -79,16 +79,14 @@ namespace Microsoft.AspNetCore.Hosting - _hostingServiceProvider = hostingServiceProvider; - _applicationServiceCollection.AddSingleton(); - // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360 --#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. -- _applicationServiceCollection.AddSingleton(services -- => services.GetService() as IHostApplicationLifetime); -+ _applicationServiceCollection.AddSingleton(services -+ => services.GetService()!); - #pragma warning disable CS0618 // Type or member is obsolete -- _applicationServiceCollection.AddSingleton(services -- => services.GetService() as AspNetCore.Hosting.IApplicationLifetime); -- _applicationServiceCollection.AddSingleton(services -- => services.GetService() as Extensions.Hosting.IApplicationLifetime); -+ _applicationServiceCollection.AddSingleton(services -+ => services.GetService()!); -+ _applicationServiceCollection.AddSingleton(services -+ => services.GetService()!); - #pragma warning restore CS0618 // Type or member is obsolete --#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. - _applicationServiceCollection.AddSingleton(); - } - diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 1c6710555..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -23,11 +23,11 @@ index a1f21de26..ff74d6e7f 100644 @@ -22,9 +22,6 @@ - + - - - - + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index 0afe8be53..f94119820 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644 @@ -6,6 +6,7 @@ Exe CSharpInteractive - net6.0;net472 + netcoreapp3.1;net472 + false @@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644 @@ -6,6 +6,7 @@ Exe Sub Main - net6.0;net472 + netcoreapp3.1;net472 + false From 26f2b4eb6c2cd3a3c229dbd7589ff6fc924cd681 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:06:45 +0000 Subject: [PATCH 133/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12756) [release/6.0.2xx] 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 fce0214d0..5d68bea6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 897a9709eb370a92bce2391d77b03d06149cbb6c From 6d5146068a318a55828d41413d68d19b48e42eb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:03:27 +0000 Subject: [PATCH 134/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12767) [release/6.0.2xx] 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 5d68bea6c..61235a858 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 897a9709eb370a92bce2391d77b03d06149cbb6c + 8e0f29bef4764af0fecece781ba606e4c61b352f From b0cb972aeb4c539edf2ddcbb5b3fe0f1ef0133b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:24:22 +0000 Subject: [PATCH 135/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12769) [release/6.0.2xx] 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 61235a858..c0f487fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 8e0f29bef4764af0fecece781ba606e4c61b352f + 67a6ec56185bfec2a52e211b25335849bdb630af From 38a612150c53bbadffce67143067cabeab6e2f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:00:56 +0000 Subject: [PATCH 136/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12772) [release/6.0.2xx] 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 c0f487fc3..49d9fe91d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 67a6ec56185bfec2a52e211b25335849bdb630af + d18b3749457151f76d5f9fc4a1318d9be3bbfbff From df1975d667b7d86d841ab0932a92052fdd5b59f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 22:28:44 +0000 Subject: [PATCH 137/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.2 (#12774) [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 542387c61..d032b3a53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 491ab3cd1a66bd4b38a915d42f36931571f8dec2 From 1a0a9b8e97a1ba59476683f8b2da1002b7d00c09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 08:27:53 +0000 Subject: [PATCH 138/239] [main] Update dependencies from dotnet/sdk (#12777) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21580.7 to 7.0.0-alpha.1.21608.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21580.7 to 7.0.0-alpha.1.21608.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21580.7 to 7.0.0-alpha.1.21608.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21601.8 to 7.0.0-alpha.1.21608.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21601.1 to 7.0.100-alpha.1.21608.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21601.1 to 7.0.100-alpha.1.21608.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21580.7 to 7.0.0-alpha.1.21608.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21580.1 to 7.0.0-alpha.1.21607.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21580.7 to 7.0.0-alpha.1.21608.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21580.3 to 7.0.0-alpha.1.21607.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211202-01 to 17.1.0-release-20211208-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21601.2 to 7.0.100-1.21608.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21580.11 to 7.0.0-alpha.1.21607.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21601.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) --- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d032b3a53..fd73c6412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 411473ddf9b7d031eae26395a816b0059faa2c50 + 34528fc32412569bd9f3b2313e38e02ac7a6255d - + https://github.com/dotnet/windowsdesktop - 411473ddf9b7d031eae26395a816b0059faa2c50 + 34528fc32412569bd9f3b2313e38e02ac7a6255d - + https://github.com/dotnet/windowsdesktop - 411473ddf9b7d031eae26395a816b0059faa2c50 + 34528fc32412569bd9f3b2313e38e02ac7a6255d - + https://github.com/dotnet/windowsdesktop - 411473ddf9b7d031eae26395a816b0059faa2c50 + 34528fc32412569bd9f3b2313e38e02ac7a6255d - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d + 75fe52025a9be974dbf5bfb878f71ed3cad71b8c - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 - + https://github.com/dotnet/aspnetcore - a32dde1438404a98ec437e249f43666cd4001170 + d84666f43f0f27381e607778d3308bf67715c507 https://github.com/dotnet/test-templates @@ -90,32 +90,32 @@ a27234829e6f68613c9f558bc548539a9cc397bb - + https://github.com/dotnet/templating - 9b8b780bf233907ae5d38aaf8c8b769782322735 + c1619ffea61fc660d3be0779f53a5be3d25d77fd - + https://github.com/dotnet/templating - 9b8b780bf233907ae5d38aaf8c8b769782322735 + c1619ffea61fc660d3be0779f53a5be3d25d77fd - + https://github.com/dotnet/sdk - 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c + 5c74692ebd019cc79b57f52badfb5fa0ae46318e - + https://github.com/dotnet/sdk - 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c + 5c74692ebd019cc79b57f52badfb5fa0ae46318e - + https://github.com/dotnet/winforms - 36b637614457bf865679cf2f8730fe0676cc91c2 + dcff71d185893abce881cff1be5818381365118a - + https://github.com/dotnet/wpf - 095e51221dd8c9d603cff3eebd23252179350ae7 + ef5004574750d038a3b7b7e222e9be6ee69879bb https://github.com/dotnet/fsharp @@ -126,14 +126,14 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 3599fd55bbabfe757db4121b3cd04b8512bd86b7 + c9489b43b2cb3292472a2ac304a86747c868d7f0 - + https://github.com/dotnet/linker - 2914e5a11fa685c2ce90e1ba972c9ac5deea079c + 6a787f26be8c95a6c742d628acf0c0678d8122e3 linker @@ -161,9 +161,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk - 24412d4288fda1d3c9fed49a7961bb4c476c0ce6 + 4eb953d7051890da4f36167125c6b41e06d7f56d https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index e0a1608c2..83074e817 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-alpha.1.21580.1 + 7.0.0-alpha.1.21607.13 - 7.0.0-alpha.1.21580.3 + 7.0.0-alpha.1.21607.14 - 7.0.100-alpha.1.21601.1 + 7.0.100-alpha.1.21608.2 @@ -51,44 +51,44 @@ - 7.0.0-alpha.1.21601.8 - 7.0.0-alpha.1.21601.8 - 7.0.0-alpha.1.21601.8 - 7.0.0-alpha.1.21601.8 - 7.0.0-alpha.1.21601.8 - 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21608.5 0.2.0 - 7.0.100-alpha.1.21602.1 - 7.0.100-alpha.1.21602.1 + 7.0.100-alpha.1.21608.16 + 7.0.100-alpha.1.21608.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21607.10 2.1.0 - 7.0.0-alpha.1.21580.7 - 7.0.0-alpha.1.21580.7 - 7.0.0-alpha.1.21580.7 - 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21608.1 + 7.0.0-alpha.1.21608.1 + 7.0.0-alpha.1.21608.1 + 7.0.0-alpha.1.21608.1 @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211202-01 + 17.1.0-release-20211208-01 @@ -192,7 +192,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-alpha.1.21560.2 + 7.0.0-alpha.1.21601.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 702a984521304be522a79d516286463608d15401 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 14:33:51 +0000 Subject: [PATCH 139/239] Update dependencies from https://github.com/dotnet/arcade build 20211208.1 (#12779) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/cross/armv6/sources.list.buster | 2 + eng/common/cross/build-rootfs.sh | 17 ++++- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 4 +- 8 files changed, 111 insertions(+), 70 deletions(-) create mode 100644 eng/common/cross/armv6/sources.list.buster create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd73c6412..53901a40b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 83074e817..85cb4b1a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21606.6 + 7.0.0-beta.21608.1 diff --git a/eng/common/cross/armv6/sources.list.buster b/eng/common/cross/armv6/sources.list.buster new file mode 100644 index 000000000..f27fc4fb3 --- /dev/null +++ b/eng/common/cross/armv6/sources.list.buster @@ -0,0 +1,2 @@ +deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6fa2c8aa5..5102245b7 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -99,6 +99,15 @@ while :; do __AlpineArch=armv7 __QEMUArch=arm ;; + armv6) + __BuildArch=armv6 + __UbuntuArch=armhf + __QEMUArch=arm + __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" + __CodeName=buster + __LLDB_Package="liblldb-6.0-dev" + __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg" + ;; arm64) __BuildArch=arm64 __UbuntuArch=arm64 @@ -236,6 +245,12 @@ while :; do shift done +if [ -e "$__Keyring" ]; then + __Keyring="--keyring=$__Keyring" +else + __Keyring="" +fi + if [ "$__BuildArch" == "armel" ]; then __LLDB_Package="lldb-3.5-dev" fi @@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h elif [[ -n $__CodeName ]]; then - qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo + qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list chroot $__RootfsDir apt-get update chroot $__RootfsDir apt-get -f -y install diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 8128f2c35..8cf772b3c 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -51,14 +51,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.109.0 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: vmImage: windows-2019 steps: @@ -125,57 +120,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 000000000..7b8ee18a2 --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 000000000..dbdd66d4a --- /dev/null +++ b/eng/common/templates/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index eca04b09f..40a407c5c 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.21606.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21606.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21608.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21608.1" } } From a3129d8eb2b8602bfeec44551aa8f22253375389 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 16:47:34 +0000 Subject: [PATCH 140/239] Update dependencies from https://github.com/dotnet/sdk build 20211209.1 (#12780) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21608.1 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21608.1 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21608.1 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21608.1 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21607.13 to 7.0.0-alpha.1.21608.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21608.1 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21607.14 to 7.0.0-alpha.1.21609.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53901a40b..de08c1dc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 34528fc32412569bd9f3b2313e38e02ac7a6255d + a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 - + https://github.com/dotnet/windowsdesktop - 34528fc32412569bd9f3b2313e38e02ac7a6255d + a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 - + https://github.com/dotnet/windowsdesktop - 34528fc32412569bd9f3b2313e38e02ac7a6255d + a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 - + https://github.com/dotnet/windowsdesktop - 34528fc32412569bd9f3b2313e38e02ac7a6255d + a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 https://github.com/dotnet/runtime @@ -99,23 +99,23 @@ c1619ffea61fc660d3be0779f53a5be3d25d77fd - + https://github.com/dotnet/sdk - 5c74692ebd019cc79b57f52badfb5fa0ae46318e + 2c3e8058449378f39664af79ead96bea7a744d84 - + https://github.com/dotnet/sdk - 5c74692ebd019cc79b57f52badfb5fa0ae46318e + 2c3e8058449378f39664af79ead96bea7a744d84 - + https://github.com/dotnet/winforms - dcff71d185893abce881cff1be5818381365118a + 8ea3dfb805969d66fc0d96b5911c8a2d797d99f1 - + https://github.com/dotnet/wpf - ef5004574750d038a3b7b7e222e9be6ee69879bb + 1b60c7c0a6e605920350aeec2a5ea5639d6175c7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 85cb4b1a9..c7592c245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21607.13 + 7.0.0-alpha.1.21608.8 - 7.0.0-alpha.1.21607.14 + 7.0.0-alpha.1.21609.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21608.16 - 7.0.100-alpha.1.21608.16 + 7.0.100-alpha.1.21609.1 + 7.0.100-alpha.1.21609.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -85,10 +85,10 @@ - 7.0.0-alpha.1.21608.1 - 7.0.0-alpha.1.21608.1 - 7.0.0-alpha.1.21608.1 - 7.0.0-alpha.1.21608.1 + 7.0.0-alpha.1.21609.1 + 7.0.0-alpha.1.21609.1 + 7.0.0-alpha.1.21609.1 + 7.0.0-alpha.1.21609.1 From 69f2b1b7b21927aa522ce4285c2da55dbad25000 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:54:56 +0000 Subject: [PATCH 141/239] Update dependencies from https://github.com/dotnet/sdk build 20211209.2 (#12781) [main] Update dependencies from dotnet/sdk --- 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 de08c1dc7..8001ac48b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ c1619ffea61fc660d3be0779f53a5be3d25d77fd - + https://github.com/dotnet/sdk - 2c3e8058449378f39664af79ead96bea7a744d84 + d33ef78b1e7710ce9dc461f73ff617958a6273e9 - + https://github.com/dotnet/sdk - 2c3e8058449378f39664af79ead96bea7a744d84 + d33ef78b1e7710ce9dc461f73ff617958a6273e9 diff --git a/eng/Versions.props b/eng/Versions.props index c7592c245..299e37170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21609.1 - 7.0.100-alpha.1.21609.1 + 7.0.100-alpha.1.21609.2 + 7.0.100-alpha.1.21609.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5907d7cd800e9e293c7ccc79a613e786701193ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 02:21:45 +0000 Subject: [PATCH 142/239] Update dependencies from https://github.com/dotnet/sdk build 20211209.6 (#12783) [main] Update dependencies from dotnet/sdk --- 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 8001ac48b..680ca0304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ c1619ffea61fc660d3be0779f53a5be3d25d77fd - + https://github.com/dotnet/sdk - d33ef78b1e7710ce9dc461f73ff617958a6273e9 + b5fe51a35b2d56ffc2a13f27dd08a5d88f598cf7 - + https://github.com/dotnet/sdk - d33ef78b1e7710ce9dc461f73ff617958a6273e9 + b5fe51a35b2d56ffc2a13f27dd08a5d88f598cf7 diff --git a/eng/Versions.props b/eng/Versions.props index 299e37170..0630e2b06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21609.2 - 7.0.100-alpha.1.21609.2 + 7.0.100-alpha.1.21609.6 + 7.0.100-alpha.1.21609.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2ee31579ad5cd879bb40be92f19ed72c70566b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 07:04:22 +0000 Subject: [PATCH 143/239] [main] Update dependencies from dotnet/sdk (#12784) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21608.5 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21608.2 to 7.0.100-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21608.2 to 7.0.100-alpha.1.21609.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-release-20211208-01 to 17.2.0-preview-20211209-03 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21607.10 to 7.0.0-alpha.1.21608.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 680ca0304..3d0870a51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 75fe52025a9be974dbf5bfb878f71ed3cad71b8c + b5799616ca76475703d541547625e09471a419bf - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 - + https://github.com/dotnet/aspnetcore - d84666f43f0f27381e607778d3308bf67715c507 + 7672ca91ab13b0a9f0f94388ddda79e8642831d4 https://github.com/dotnet/test-templates @@ -90,23 +90,23 @@ a27234829e6f68613c9f558bc548539a9cc397bb - + https://github.com/dotnet/templating - c1619ffea61fc660d3be0779f53a5be3d25d77fd + 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/templating - c1619ffea61fc660d3be0779f53a5be3d25d77fd + 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - b5fe51a35b2d56ffc2a13f27dd08a5d88f598cf7 + f49a059452e6784f3e11036cc66bc615425768a7 - + https://github.com/dotnet/sdk - b5fe51a35b2d56ffc2a13f27dd08a5d88f598cf7 + f49a059452e6784f3e11036cc66bc615425768a7 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - c9489b43b2cb3292472a2ac304a86747c868d7f0 + 61da6f27702b8330c99da8fa9f5c82722971cd73 diff --git a/eng/Versions.props b/eng/Versions.props index 0630e2b06..d4c623d3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21608.2 + 7.0.100-alpha.1.21609.1 @@ -51,36 +51,36 @@ - 7.0.0-alpha.1.21608.5 - 7.0.0-alpha.1.21608.5 - 7.0.0-alpha.1.21608.5 - 7.0.0-alpha.1.21608.5 - 7.0.0-alpha.1.21608.5 - 7.0.0-alpha.1.21608.5 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 0.2.0 - 7.0.100-alpha.1.21609.6 - 7.0.100-alpha.1.21609.6 + 7.0.100-alpha.1.21609.13 + 7.0.100-alpha.1.21609.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21607.10 - 7.0.0-alpha.1.21607.10 + 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21608.10 2.1.0 @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-release-20211208-01 + 17.2.0-preview-20211209-03 From 4bfe6b61d619e49bf5f6340062818a62928cee96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:01:24 +0000 Subject: [PATCH 144/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.1 (#12785) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21608.1 to 7.0.100-1.21609.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d0870a51..0c75e1c4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - f49a059452e6784f3e11036cc66bc615425768a7 + 9d64b48802348f06cf7499ed488ceed0f8572128 - + https://github.com/dotnet/sdk - f49a059452e6784f3e11036cc66bc615425768a7 + 9d64b48802348f06cf7499ed488ceed0f8572128 @@ -131,9 +131,9 @@ 61da6f27702b8330c99da8fa9f5c82722971cd73 - + https://github.com/dotnet/linker - 6a787f26be8c95a6c742d628acf0c0678d8122e3 + 581b5b182534f0a916b1d2f9032584f29e3f0b29 linker diff --git a/eng/Versions.props b/eng/Versions.props index d4c623d3b..8b747f9b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21609.13 - 7.0.100-alpha.1.21609.13 + 7.0.100-alpha.1.21610.1 + 7.0.100-alpha.1.21610.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d3ff42d64f3f8199c283c68ae5fbbf62296b0f3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 07:17:36 -0800 Subject: [PATCH 145/239] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12757) * Update dependencies from https://github.com/dotnet/sdk build 20211207.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.3 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-21579-05 -> To Version 17.1.0-preview-21607-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.5 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.32 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.32 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.34 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.7 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.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20211209.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211209.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.16 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Disable tarball build in PR validation * Update dependencies from https://github.com/dotnet/sdk build 20211210.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 8 ++-- .../job/source-build-run-tarball-build.yml | 10 +++-- .../0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- ...2-Update-system-command-line-version.patch | 4 +- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 4 +- ...PublicApiAnalyzers-in-sourcebuild-71.patch | 26 ------------ 7 files changed, 35 insertions(+), 59 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49d9fe91d..ecd08b399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 @@ -121,18 +121,18 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/microsoft/vstest - 7f3499467c833d54d1e100d33d2ee54455112bd2 + 61da6f27702b8330c99da8fa9f5c82722971cd73 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 1073bc6ce7a0eb08968656e10042970d2f7b3b1d + 818313426323d979747781a17c78860c833776da - + https://github.com/dotnet/msbuild - 23940013c60c33c183e52547ce6ca535b6689d4c + 96a618ca59610908eddc92bfd0198746c34f0ed5 - + https://github.com/nuget/nuget.client - c14b85a00c03933c708c7d38fefeda9898a21488 + 9187a50daec29061772a2057490697c6c0e4c354 diff --git a/eng/Versions.props b/eng/Versions.props index c2c8dd95d..28a619f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21572.3 + 6.0.200-alpha.1.21609.2 @@ -56,8 +56,8 @@ - 6.0.200-preview.21607.2 - 6.0.200-preview.21607.2 + 6.0.200-preview.21610.4 + 6.0.200-preview.21610.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211130-04 + 17.2.0-preview-20211209-03 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 index 70d81e3d6..11259ab58 100644 --- 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 @@ -37,10 +37,12 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - Fedora33-Offline: - _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} - _RunOnline: false + # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Fedora33-Offline: + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 workspace: clean: all diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..7d5d03116 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch index 4d5554a71..68917950e 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -19,7 +19,7 @@ index 48b181b..68c0b43 100644 +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 + c7d6f9fab845ffd943216da465022744e7d35f22 - + @@ -41,7 +41,7 @@ index 2758207..6a02917 100644 +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 - 2.0.0-beta1.21473.1 - 0.3.0-alpha.21473.1 diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 1c6710555..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -23,11 +23,11 @@ index a1f21de26..ff74d6e7f 100644 @@ -22,9 +22,6 @@ - + - - - - + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch deleted file mode 100644 index a0133a35f..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rainer Sigwald -Date: Fri, 3 Dec 2021 14:24:03 -0600 -Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) - -This package is only super relevant at PR-build time so it should -be fine to drop it from source-build scenarios. Fixes #7115. - -Patch created from https://github.com/dotnet/msbuild/pull/7118 ---- - src/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets -index 2a840bfd7..bff6cc905 100644 ---- a/src/Directory.Build.targets -+++ b/src/Directory.Build.targets -@@ -85,7 +85,7 @@ - - - -- -+ - - - From e6cba241b9b4041bb96d78289d4b53b4e1078903 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 15:22:42 +0000 Subject: [PATCH 146/239] Update dependencies from https://github.com/dotnet/arcade build 20211209.2 (#12786) [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 0c75e1c4a..7684a4567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 200adbc809c4451973d1929a53a75502b7cada01 + 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 - + https://github.com/dotnet/arcade - 200adbc809c4451973d1929a53a75502b7cada01 + 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 - + https://github.com/dotnet/arcade - 200adbc809c4451973d1929a53a75502b7cada01 + 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8b747f9b7..c02834d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21608.1 + 7.0.0-beta.21609.2 diff --git a/global.json b/global.json index 40a407c5c..e1a108ce1 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.21608.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21608.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21609.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21609.2" } } From 98a0afe419819d00e8329d813b6d87daa9b31fab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 17:28:20 +0000 Subject: [PATCH 147/239] [main] Update dependencies from dotnet/sdk (#12787) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21608.8 to 7.0.0-alpha.1.21609.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21609.1 to 7.0.0-alpha.1.21609.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7684a4567..4cee3e5a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 + 51e94719d06800cb872341ae8ac1e6163d1b937c - + https://github.com/dotnet/windowsdesktop - a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 + 51e94719d06800cb872341ae8ac1e6163d1b937c - + https://github.com/dotnet/windowsdesktop - a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 + 51e94719d06800cb872341ae8ac1e6163d1b937c - + https://github.com/dotnet/windowsdesktop - a73d96e95ef5456bee43c19035b7e7d1a1ecaab2 + 51e94719d06800cb872341ae8ac1e6163d1b937c https://github.com/dotnet/runtime @@ -99,23 +99,23 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - 9d64b48802348f06cf7499ed488ceed0f8572128 + 54be89836dfd49f5d55ceab27051dc4219db225c - + https://github.com/dotnet/sdk - 9d64b48802348f06cf7499ed488ceed0f8572128 + 54be89836dfd49f5d55ceab27051dc4219db225c - + https://github.com/dotnet/winforms - 8ea3dfb805969d66fc0d96b5911c8a2d797d99f1 + e283294aefed00a944d0f8e0345859fdc2425a1c - + https://github.com/dotnet/wpf - 1b60c7c0a6e605920350aeec2a5ea5639d6175c7 + 10338c9f1f57619d3f6530c8f62d57d0547f89e2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c02834d6b..e0b341e11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21608.8 + 7.0.0-alpha.1.21609.2 - 7.0.0-alpha.1.21609.1 + 7.0.0-alpha.1.21609.3 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21610.1 - 7.0.100-alpha.1.21610.1 + 7.0.100-alpha.1.21610.6 + 7.0.100-alpha.1.21610.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -85,10 +85,10 @@ - 7.0.0-alpha.1.21609.1 - 7.0.0-alpha.1.21609.1 - 7.0.0-alpha.1.21609.1 - 7.0.0-alpha.1.21609.1 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21609.4 From 948cabe984382b53e75e58c0c249345ba9694cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:59:46 +0000 Subject: [PATCH 148/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.7 (#12788) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21608.2 to 12.0.1-beta.21610.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21608.2 to 6.0.2-beta.21610.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecd08b399..8565b8b75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed - + https://github.com/dotnet/sdk - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 diff --git a/eng/Versions.props b/eng/Versions.props index 28a619f3b..436e8cfa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.4 - 6.0.200-preview.21610.4 + 6.0.200-preview.21610.7 + 6.0.200-preview.21610.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70187fdee018dd4a04d6ff644d2ec1f81f6da7b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:06:34 +0000 Subject: [PATCH 149/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.9 (#12792) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211209-03 to 17.2.0-preview-20211210-01 (parent: Microsoft.NET.Sdk) --- 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 8565b8b75..68a7a36fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f - + https://github.com/dotnet/sdk - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f @@ -130,9 +130,9 @@ c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/microsoft/vstest - 61da6f27702b8330c99da8fa9f5c82722971cd73 + a809880e02d8a9986e3ba1daeeeb5078fbb96be5 diff --git a/eng/Versions.props b/eng/Versions.props index 436e8cfa6..cac842119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.7 - 6.0.200-preview.21610.7 + 6.0.200-preview.21610.9 + 6.0.200-preview.21610.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211209-03 + 17.2.0-preview-20211210-01 From a49ae8e787d738263ac64feb95cb9b5e1962c650 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:23:24 +0000 Subject: [PATCH 150/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.8 (#12791) [main] Update dependencies from dotnet/sdk --- 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 4cee3e5a4..d3a95ddef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - 54be89836dfd49f5d55ceab27051dc4219db225c + 23a5bb24a58a4034d782c4bfdba7cc4a19a8db4e - + https://github.com/dotnet/sdk - 54be89836dfd49f5d55ceab27051dc4219db225c + 23a5bb24a58a4034d782c4bfdba7cc4a19a8db4e diff --git a/eng/Versions.props b/eng/Versions.props index e0b341e11..087e21ba4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21610.6 - 7.0.100-alpha.1.21610.6 + 7.0.100-alpha.1.21610.8 + 7.0.100-alpha.1.21610.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f713cf964951b30af8e82b3c6e06661ee1330132 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 21:31:10 +0000 Subject: [PATCH 151/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.10 (#12793) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211209-03 to 17.2.0-preview-20211210-01 (parent: Microsoft.NET.Sdk) --- 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 d3a95ddef..b4fb23a6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - 23a5bb24a58a4034d782c4bfdba7cc4a19a8db4e + 2b6058a0c23a61945127fc4390f03a04a2e5270e - + https://github.com/dotnet/sdk - 23a5bb24a58a4034d782c4bfdba7cc4a19a8db4e + 2b6058a0c23a61945127fc4390f03a04a2e5270e @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 61da6f27702b8330c99da8fa9f5c82722971cd73 + a809880e02d8a9986e3ba1daeeeb5078fbb96be5 diff --git a/eng/Versions.props b/eng/Versions.props index 087e21ba4..c83c62b3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21610.8 - 7.0.100-alpha.1.21610.8 + 7.0.100-alpha.1.21610.10 + 7.0.100-alpha.1.21610.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211209-03 + 17.2.0-preview-20211210-01 From 19990a7cb8d1d8ef6d0b46cfed9fbea9adca2a96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 22:50:18 +0000 Subject: [PATCH 152/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.11 (#12797) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 68a7a36fa..cbdda471f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d - + https://github.com/dotnet/sdk - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d diff --git a/eng/Versions.props b/eng/Versions.props index cac842119..366068870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.9 - 6.0.200-preview.21610.9 + 6.0.200-preview.21610.11 + 6.0.200-preview.21610.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9471f49b4a5ae5cc214317eb76abef3c1fdaf98c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Dec 2021 00:11:30 +0000 Subject: [PATCH 153/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.13 (#12799) [release/6.0.2xx] Update dependencies from dotnet/sdk --- 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 cbdda471f..749cd1c63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a - + https://github.com/dotnet/sdk - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a diff --git a/eng/Versions.props b/eng/Versions.props index 366068870..68bf285d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.11 - 6.0.200-preview.21610.11 + 6.0.200-preview.21610.13 + 6.0.200-preview.21610.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e117562cc943d1ce5d2613feb8eee0f6b2fa576b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Dec 2021 00:23:59 +0000 Subject: [PATCH 154/239] Update dependencies from https://github.com/dotnet/sdk build 20211210.12 (#12798) [main] Update dependencies from dotnet/sdk --- 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 b4fb23a6c..cac7d4618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - 2b6058a0c23a61945127fc4390f03a04a2e5270e + 57409b404d4f34c38f564865b5e1cfdd4249af42 - + https://github.com/dotnet/sdk - 2b6058a0c23a61945127fc4390f03a04a2e5270e + 57409b404d4f34c38f564865b5e1cfdd4249af42 diff --git a/eng/Versions.props b/eng/Versions.props index c83c62b3a..98d05aae4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21610.10 - 7.0.100-alpha.1.21610.10 + 7.0.100-alpha.1.21610.12 + 7.0.100-alpha.1.21610.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b9a11989ddb0cf628dfa764085d2d45f473eb03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Dec 2021 14:15:37 +0000 Subject: [PATCH 155/239] Update dependencies from https://github.com/dotnet/arcade build 20211210.4 (#12801) [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 cac7d4618..be9cc3529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 + 18adc5b47acce8bb03948baf578fca442d1029d4 - + https://github.com/dotnet/arcade - 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 + 18adc5b47acce8bb03948baf578fca442d1029d4 - + https://github.com/dotnet/arcade - 05a63c6bae31f97583d35f5a16e1bd8f41a1d094 + 18adc5b47acce8bb03948baf578fca442d1029d4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 98d05aae4..8bba6d5b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21609.2 + 7.0.0-beta.21610.4 diff --git a/global.json b/global.json index e1a108ce1..f407713f1 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.21609.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21609.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21610.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21610.4" } } From c00ec154c5d70f75b6671641fc616e07f514b0c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:14:32 +0000 Subject: [PATCH 156/239] [main] Update dependencies from dotnet/sdk (#12800) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21609.4 to 7.0.0-alpha.1.21611.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21609.3 to 7.0.0-alpha.1.21611.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21608.10 to 7.0.0-alpha.1.21611.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9cc3529..6b26237ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 51e94719d06800cb872341ae8ac1e6163d1b937c + 23bd6f4091ec84264d381005dda19566a059dc65 - + https://github.com/dotnet/windowsdesktop - 51e94719d06800cb872341ae8ac1e6163d1b937c + 23bd6f4091ec84264d381005dda19566a059dc65 - + https://github.com/dotnet/windowsdesktop - 51e94719d06800cb872341ae8ac1e6163d1b937c + 23bd6f4091ec84264d381005dda19566a059dc65 - + https://github.com/dotnet/windowsdesktop - 51e94719d06800cb872341ae8ac1e6163d1b937c + 23bd6f4091ec84264d381005dda19566a059dc65 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b5799616ca76475703d541547625e09471a419bf + 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d - + https://github.com/dotnet/aspnetcore - 7672ca91ab13b0a9f0f94388ddda79e8642831d4 + 44ce471a663ccfde41703af305fe4b19da6eca4d https://github.com/dotnet/test-templates @@ -99,23 +99,23 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - 57409b404d4f34c38f564865b5e1cfdd4249af42 + abb0edddae564559433d974a5cc82d8ff5b7cee2 - + https://github.com/dotnet/sdk - 57409b404d4f34c38f564865b5e1cfdd4249af42 + abb0edddae564559433d974a5cc82d8ff5b7cee2 https://github.com/dotnet/winforms e283294aefed00a944d0f8e0345859fdc2425a1c - + https://github.com/dotnet/wpf - 10338c9f1f57619d3f6530c8f62d57d0547f89e2 + 82383246cc675d61b48b79eaf1a06550cec11cdd https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8bba6d5b4..857da2c5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 7.0.0-alpha.1.21609.3 + 7.0.0-alpha.1.21611.1 @@ -51,44 +51,44 @@ - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21611.1 0.2.0 - 7.0.100-alpha.1.21610.12 - 7.0.100-alpha.1.21610.12 + 7.0.100-alpha.1.21612.2 + 7.0.100-alpha.1.21612.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21608.10 - 7.0.0-alpha.1.21608.10 + 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21611.3 2.1.0 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 - 7.0.0-alpha.1.21609.4 + 7.0.0-alpha.1.21611.2 + 7.0.0-alpha.1.21611.2 + 7.0.0-alpha.1.21611.2 + 7.0.0-alpha.1.21611.2 From 74d83b52e6f44094a92c91f036fa481d5b14d932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 05:02:12 +0000 Subject: [PATCH 157/239] Update dependencies from https://github.com/dotnet/sdk build 20211212.4 (#12803) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) --- 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 749cd1c63..667a5aac0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,11 +90,11 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb diff --git a/eng/Versions.props b/eng/Versions.props index 68bf285d1..18a9b2510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21609.2 + 6.0.200-alpha.1.21609.4 @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.13 - 6.0.200-preview.21610.13 + 6.0.200-preview.21612.4 + 6.0.200-preview.21612.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb85cc2e6962fa7f00b7e46bbe1ade1c001dad98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 05:19:10 +0000 Subject: [PATCH 158/239] Update dependencies from https://github.com/dotnet/sdk build 20211212.3 (#12804) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21612.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b26237ca..31dde1aa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 20f994c0457bcd1e2f54aa02da17290d7fc48b29 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/aspnetcore - 44ce471a663ccfde41703af305fe4b19da6eca4d + 774554dfeddd3450f31d979c56060b0451dd49d7 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f - + https://github.com/dotnet/sdk - abb0edddae564559433d974a5cc82d8ff5b7cee2 + bf3bad2dbb8ef29d40dd80dae72552abe0f42f5d - + https://github.com/dotnet/sdk - abb0edddae564559433d974a5cc82d8ff5b7cee2 + bf3bad2dbb8ef29d40dd80dae72552abe0f42f5d diff --git a/eng/Versions.props b/eng/Versions.props index 857da2c5b..15a2509ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21611.1 - 7.0.0-alpha.1.21611.1 - 7.0.0-alpha.1.21611.1 - 7.0.0-alpha.1.21611.1 - 7.0.0-alpha.1.21611.1 - 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21612.1 0.2.0 - 7.0.100-alpha.1.21612.2 - 7.0.100-alpha.1.21612.2 + 7.0.100-alpha.1.21612.3 + 7.0.100-alpha.1.21612.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e73c2e68f55ea95dada1bbece065f0db16a9968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 06:30:14 +0000 Subject: [PATCH 159/239] Update dependencies from https://github.com/dotnet/sdk build 20211212.5 (#12805) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21609.1 to 7.0.100-alpha.1.21610.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21609.1 to 7.0.100-alpha.1.21610.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21609.3 to 7.0.100-1.21610.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 31dde1aa2..bb9829313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ a27234829e6f68613c9f558bc548539a9cc397bb - + https://github.com/dotnet/templating - 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f + 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/templating - 8b8aaf6d56ba1f628b5155deb4c2ebe5192e9e4f + 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - bf3bad2dbb8ef29d40dd80dae72552abe0f42f5d + bbdb1a433720e1e91cb4fbb48c122b69666be381 - + https://github.com/dotnet/sdk - bf3bad2dbb8ef29d40dd80dae72552abe0f42f5d + bbdb1a433720e1e91cb4fbb48c122b69666be381 @@ -131,9 +131,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - 581b5b182534f0a916b1d2f9032584f29e3f0b29 + 25323570686848f192bd05e726aff5c91eb0b2f0 linker diff --git a/eng/Versions.props b/eng/Versions.props index 15a2509ce..84331a371 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21609.1 + 7.0.100-alpha.1.21610.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21612.3 - 7.0.100-alpha.1.21612.3 + 7.0.100-alpha.1.21612.5 + 7.0.100-alpha.1.21612.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 45a11d156af44ee6a286117c6c015a460a6d1c44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:27:34 +0000 Subject: [PATCH 160/239] Update dependencies from https://github.com/dotnet/test-templates build 20211213.1 (#12807) [main] 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 bb9829313..074438cde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/test-templates - a27234829e6f68613c9f558bc548539a9cc397bb + 312f010a9e67c2e10042fa89e37b85fe5c8ada32 - + https://github.com/dotnet/test-templates - a27234829e6f68613c9f558bc548539a9cc397bb + 312f010a9e67c2e10042fa89e37b85fe5c8ada32 - + https://github.com/dotnet/test-templates - a27234829e6f68613c9f558bc548539a9cc397bb + 312f010a9e67c2e10042fa89e37b85fe5c8ada32 diff --git a/eng/Versions.props b/eng/Versions.props index 84331a371..3356da2c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ - 1.0.2-beta4.21606.1 - 1.0.2-beta4.21606.1 + 1.0.2-beta4.21613.1 + 1.0.2-beta4.21613.1 @@ -152,7 +152,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21606.1 + 1.0.2-beta4.21613.1 2.1.30 From 35f425f90af70e770f38a597cece10dbd6fb35f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 16:25:44 +0000 Subject: [PATCH 161/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.1 (#12808) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21611.3 to 7.0.0-alpha.1.21612.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 074438cde..fd6d17c1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 23bd6f4091ec84264d381005dda19566a059dc65 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 20f994c0457bcd1e2f54aa02da17290d7fc48b29 + 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 https://github.com/dotnet/aspnetcore @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - bbdb1a433720e1e91cb4fbb48c122b69666be381 + 82207a028f1f18e12c5fb4868fa49601a3c8d0fb - + https://github.com/dotnet/sdk - bbdb1a433720e1e91cb4fbb48c122b69666be381 + 82207a028f1f18e12c5fb4868fa49601a3c8d0fb diff --git a/eng/Versions.props b/eng/Versions.props index 3356da2c3..0397cffb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,24 +63,24 @@ - 7.0.100-alpha.1.21612.5 - 7.0.100-alpha.1.21612.5 + 7.0.100-alpha.1.21613.1 + 7.0.100-alpha.1.21613.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21611.3 - 7.0.0-alpha.1.21611.3 + 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21612.5 2.1.0 From c82c98f856c13e5b3617da64c64747b6646e2908 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 17:31:39 +0000 Subject: [PATCH 162/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.2 (#12809) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21610.1 to 7.0.100-1.21613.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd6d17c1d..486ef698e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - 82207a028f1f18e12c5fb4868fa49601a3c8d0fb + 4bcfc0ca656ca146b0267a3059792e43d1a30da6 - + https://github.com/dotnet/sdk - 82207a028f1f18e12c5fb4868fa49601a3c8d0fb + 4bcfc0ca656ca146b0267a3059792e43d1a30da6 @@ -131,9 +131,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - 25323570686848f192bd05e726aff5c91eb0b2f0 + d25d197d76a34f7505a976040f31fea1ebe489f6 linker diff --git a/eng/Versions.props b/eng/Versions.props index 0397cffb5..caaef6053 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21613.1 - 7.0.100-alpha.1.21613.1 + 7.0.100-alpha.1.21613.2 + 7.0.100-alpha.1.21613.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8c9c22117ca2db1d42f0d2c367450c818202a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:20:28 +0000 Subject: [PATCH 163/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12811) [release/6.0.2xx] 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 667a5aac0..a87dbe481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - d18b3749457151f76d5f9fc4a1318d9be3bbfbff + e025965a8e463030d890739043b6e64b41a5de84 From 1d49ad47eead13445e4037d38fdde4d013fcf911 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:36:38 +0000 Subject: [PATCH 164/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.2 (#12813) [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 486ef698e..38626818a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade 18adc5b47acce8bb03948baf578fca442d1029d4 - + https://github.com/dotnet/source-build-reference-packages - 491ab3cd1a66bd4b38a915d42f36931571f8dec2 + 6e776828ab897d3e76ea1adf8b1a4c859f70cc0c From 0d2d420be0ca2de6d328546ead31bf7225d283b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 19:05:42 +0000 Subject: [PATCH 165/239] Update dependencies from https://github.com/dotnet/test-templates build 20211213.2 (#12814) [main] 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 38626818a..91fc6073b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore 774554dfeddd3450f31d979c56060b0451dd49d7 - + https://github.com/dotnet/test-templates - 312f010a9e67c2e10042fa89e37b85fe5c8ada32 + 46638329316539e78e8b6fd9ffbe549132eedbe6 - + https://github.com/dotnet/test-templates - 312f010a9e67c2e10042fa89e37b85fe5c8ada32 + 46638329316539e78e8b6fd9ffbe549132eedbe6 - + https://github.com/dotnet/test-templates - 312f010a9e67c2e10042fa89e37b85fe5c8ada32 + 46638329316539e78e8b6fd9ffbe549132eedbe6 diff --git a/eng/Versions.props b/eng/Versions.props index caaef6053..3e8e08407 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ - 1.0.2-beta4.21613.1 - 1.0.2-beta4.21613.1 + 1.0.2-beta4.21613.2 + 1.0.2-beta4.21613.2 @@ -152,7 +152,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21613.1 + 1.0.2-beta4.21613.2 2.1.30 From 7dde67048d890200ed04cfe96525fa79855c88f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 21:57:36 +0000 Subject: [PATCH 166/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.3 (#12815) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21612.1 to 7.0.0-alpha.1.21613.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91fc6073b..ff51f8692 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 - + https://github.com/dotnet/aspnetcore - 774554dfeddd3450f31d979c56060b0451dd49d7 + c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - 4bcfc0ca656ca146b0267a3059792e43d1a30da6 + de3cf44fbcc379c07472b716f13453710ea4c82d - + https://github.com/dotnet/sdk - 4bcfc0ca656ca146b0267a3059792e43d1a30da6 + de3cf44fbcc379c07472b716f13453710ea4c82d diff --git a/eng/Versions.props b/eng/Versions.props index 3e8e08407..3bff10a1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21612.1 - 7.0.0-alpha.1.21612.1 - 7.0.0-alpha.1.21612.1 - 7.0.0-alpha.1.21612.1 - 7.0.0-alpha.1.21612.1 - 7.0.0-alpha.1.21612.1 + 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.1 0.2.0 - 7.0.100-alpha.1.21613.2 - 7.0.100-alpha.1.21613.2 + 7.0.100-alpha.1.21613.3 + 7.0.100-alpha.1.21613.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 283af60bbddcd098f922a0b7ae953ca9be1ffe42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 23:23:53 +0000 Subject: [PATCH 167/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.4 (#12817) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21613.1 to 7.0.0-alpha.1.21613.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff51f8692..732c7756e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 - + https://github.com/dotnet/aspnetcore - c93a1149fbcedb9ba9b8bedd62389f911faa9ef2 + 5da4337ef24ba6c7b36039e04d737f3dd4868047 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - de3cf44fbcc379c07472b716f13453710ea4c82d + 1ac288f6b5eb326d1930ceb0a0018aab26178fdd - + https://github.com/dotnet/sdk - de3cf44fbcc379c07472b716f13453710ea4c82d + 1ac288f6b5eb326d1930ceb0a0018aab26178fdd diff --git a/eng/Versions.props b/eng/Versions.props index 3bff10a1d..f488cb04d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21613.1 - 7.0.0-alpha.1.21613.1 - 7.0.0-alpha.1.21613.1 - 7.0.0-alpha.1.21613.1 - 7.0.0-alpha.1.21613.1 - 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.2 0.2.0 - 7.0.100-alpha.1.21613.3 - 7.0.100-alpha.1.21613.3 + 7.0.100-alpha.1.21613.4 + 7.0.100-alpha.1.21613.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a8eaed86c08e963d592e67ef91bd2434182f656 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 00:56:29 +0000 Subject: [PATCH 168/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.5 (#12818) [main] Update dependencies from dotnet/sdk --- 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 732c7756e..d10f6f069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - 1ac288f6b5eb326d1930ceb0a0018aab26178fdd + 0fc72ddb758dd136182972c2aea1d504ea046cfd - + https://github.com/dotnet/sdk - 1ac288f6b5eb326d1930ceb0a0018aab26178fdd + 0fc72ddb758dd136182972c2aea1d504ea046cfd diff --git a/eng/Versions.props b/eng/Versions.props index f488cb04d..84e46062a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21613.4 - 7.0.100-alpha.1.21613.4 + 7.0.100-alpha.1.21613.5 + 7.0.100-alpha.1.21613.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4589702ca5bda5f06e4fbc612a1f11da10ed0bdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 05:02:26 +0000 Subject: [PATCH 169/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.8 (#12819) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21613.2 to 7.0.0-alpha.1.21613.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d10f6f069..360dce9e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 - + https://github.com/dotnet/aspnetcore - 5da4337ef24ba6c7b36039e04d737f3dd4868047 + f5ad1c1a7480def25303396c742ec5eb0db0a9b5 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - 0fc72ddb758dd136182972c2aea1d504ea046cfd + ab86b0100828139a71c6a3a6f5c7061d52675771 - + https://github.com/dotnet/sdk - 0fc72ddb758dd136182972c2aea1d504ea046cfd + ab86b0100828139a71c6a3a6f5c7061d52675771 diff --git a/eng/Versions.props b/eng/Versions.props index 84e46062a..eeb2fb095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21613.2 - 7.0.0-alpha.1.21613.2 - 7.0.0-alpha.1.21613.2 - 7.0.0-alpha.1.21613.2 - 7.0.0-alpha.1.21613.2 - 7.0.0-alpha.1.21613.2 + 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.10 0.2.0 - 7.0.100-alpha.1.21613.5 - 7.0.100-alpha.1.21613.5 + 7.0.100-alpha.1.21613.8 + 7.0.100-alpha.1.21613.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 047e4a2033de475b993ee596d8a3b8e6eac17e5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 06:12:59 +0000 Subject: [PATCH 170/239] Update dependencies from https://github.com/dotnet/sdk build 20211213.9 (#12820) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21613.1 to 7.0.100-1.21613.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 360dce9e2..6152fafcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b - + https://github.com/dotnet/sdk - ab86b0100828139a71c6a3a6f5c7061d52675771 + fb086b9a1df13e9ab0b582daeca4c591de965c8f - + https://github.com/dotnet/sdk - ab86b0100828139a71c6a3a6f5c7061d52675771 + fb086b9a1df13e9ab0b582daeca4c591de965c8f @@ -131,9 +131,9 @@ a809880e02d8a9986e3ba1daeeeb5078fbb96be5 - + https://github.com/dotnet/linker - d25d197d76a34f7505a976040f31fea1ebe489f6 + 9781aeb54d1741f421ea3340dafae3526b34e8fe linker diff --git a/eng/Versions.props b/eng/Versions.props index eeb2fb095..4554460ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21613.8 - 7.0.100-alpha.1.21613.8 + 7.0.100-alpha.1.21613.9 + 7.0.100-alpha.1.21613.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90fe63eeb6f9b9ea559c904170bee73b0c154c63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 11:54:58 +0000 Subject: [PATCH 171/239] Update dependencies from https://github.com/dotnet/sdk build 20211214.1 (#12821) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21610.1 to 7.0.100-alpha.1.21613.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21610.1 to 7.0.100-alpha.1.21613.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 6152fafcd..7b3dbdde2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 46638329316539e78e8b6fd9ffbe549132eedbe6 - + https://github.com/dotnet/templating - 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b + e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 - + https://github.com/dotnet/templating - 9ab59284e14174ef3e9ebf7c19f3520179ed3a3b + e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 - + https://github.com/dotnet/sdk - fb086b9a1df13e9ab0b582daeca4c591de965c8f + 862576e598bc9c597023d06673fc508d3400f033 - + https://github.com/dotnet/sdk - fb086b9a1df13e9ab0b582daeca4c591de965c8f + 862576e598bc9c597023d06673fc508d3400f033 diff --git a/eng/Versions.props b/eng/Versions.props index 4554460ef..c93e15f58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21610.1 + 7.0.100-alpha.1.21613.3 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21613.9 - 7.0.100-alpha.1.21613.9 + 7.0.100-alpha.1.21614.1 + 7.0.100-alpha.1.21614.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a13e6dfb1b7f2c4347cc0856702c40accff685a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 13:00:38 +0000 Subject: [PATCH 172/239] Update dependencies from https://github.com/dotnet/sdk build 20211214.2 (#12822) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21613.10 to 7.0.0-alpha.1.21613.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b3dbdde2..dac80d86d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 - + https://github.com/dotnet/aspnetcore - f5ad1c1a7480def25303396c742ec5eb0db0a9b5 + 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 - + https://github.com/dotnet/sdk - 862576e598bc9c597023d06673fc508d3400f033 + 665f4b26eb790249f9c018f135265fadd7499bff - + https://github.com/dotnet/sdk - 862576e598bc9c597023d06673fc508d3400f033 + 665f4b26eb790249f9c018f135265fadd7499bff diff --git a/eng/Versions.props b/eng/Versions.props index c93e15f58..24a099ece 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21613.10 - 7.0.0-alpha.1.21613.10 - 7.0.0-alpha.1.21613.10 - 7.0.0-alpha.1.21613.10 - 7.0.0-alpha.1.21613.10 - 7.0.0-alpha.1.21613.10 + 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21613.11 0.2.0 - 7.0.100-alpha.1.21614.1 - 7.0.100-alpha.1.21614.1 + 7.0.100-alpha.1.21614.2 + 7.0.100-alpha.1.21614.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01c99ae871ed0a2276d3a017f4cb5bac167547d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 14:11:39 +0000 Subject: [PATCH 173/239] Update dependencies from https://github.com/dotnet/sdk build 20211214.3 (#12823) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211210-01 to 17.2.0-preview-20211213-01 (parent: Microsoft.NET.Sdk) --- 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 dac80d86d..ec5c8edae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 - + https://github.com/dotnet/sdk - 665f4b26eb790249f9c018f135265fadd7499bff + 744e2ff326c2cdddd5d0b29a425015fca998673b - + https://github.com/dotnet/sdk - 665f4b26eb790249f9c018f135265fadd7499bff + 744e2ff326c2cdddd5d0b29a425015fca998673b @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - a809880e02d8a9986e3ba1daeeeb5078fbb96be5 + 5067090f9e0ae03797a477e807ab243f5ceb90fe diff --git a/eng/Versions.props b/eng/Versions.props index 24a099ece..3bbe1323b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21614.2 - 7.0.100-alpha.1.21614.2 + 7.0.100-alpha.1.21614.3 + 7.0.100-alpha.1.21614.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211210-01 + 17.2.0-preview-20211213-01 From bd4cea5ace2ff53f7c9afa63eb7dd856320ca5b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 14:26:35 +0000 Subject: [PATCH 174/239] Update dependencies from https://github.com/dotnet/arcade build 20211213.2 (#12824) [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 ec5c8edae..2267cb7a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 18adc5b47acce8bb03948baf578fca442d1029d4 + bcd6e007b9f53be0a7aff804d5c17ea7e179317b - + https://github.com/dotnet/arcade - 18adc5b47acce8bb03948baf578fca442d1029d4 + bcd6e007b9f53be0a7aff804d5c17ea7e179317b - + https://github.com/dotnet/arcade - 18adc5b47acce8bb03948baf578fca442d1029d4 + bcd6e007b9f53be0a7aff804d5c17ea7e179317b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3bbe1323b..ed60565ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21610.4 + 7.0.0-beta.21613.2 diff --git a/global.json b/global.json index f407713f1..46a040a41 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.21610.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21610.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21613.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21613.2" } } From 41e4fdf405c982df24993fbb3e9fc7d94394a19c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:43:48 +0000 Subject: [PATCH 175/239] Update dependencies from https://github.com/dotnet/sdk build 20211214.4 (#12825) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211213-01 to 17.2.0-preview-20211214-01 (parent: Microsoft.NET.Sdk) --- 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 2267cb7a6..dd7be4dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 - + https://github.com/dotnet/sdk - 744e2ff326c2cdddd5d0b29a425015fca998673b + e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 - + https://github.com/dotnet/sdk - 744e2ff326c2cdddd5d0b29a425015fca998673b + e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 5067090f9e0ae03797a477e807ab243f5ceb90fe + 4a77384e324e8a7bd874346a9fc34fdd6f8101ae diff --git a/eng/Versions.props b/eng/Versions.props index ed60565ef..b58584d59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21614.3 - 7.0.100-alpha.1.21614.3 + 7.0.100-alpha.1.21614.4 + 7.0.100-alpha.1.21614.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211213-01 + 17.2.0-preview-20211214-01 From 2e29acc142418464086b64f81bf61cf745fc93a8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Dec 2021 10:10:05 -0800 Subject: [PATCH 176/239] Fix the logic that generates the fallback text file --- src/redist/targets/GenerateLayout.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3917efa60..a26cad868 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -463,9 +463,13 @@ + - + + + + From f2abec4abdbed5758a01797dee75ad4306eaa32c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 19:34:03 +0000 Subject: [PATCH 177/239] Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12834) [release/6.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/build.sh | 3 - eng/common/sdk-task.ps1 | 3 - eng/common/templates/job/onelocbuild.yml | 3 + eng/common/tools.ps1 | 78 +++++++++++------------- eng/common/tools.sh | 69 +++++++++++---------- global.json | 4 +- 8 files changed, 81 insertions(+), 93 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87dbe481..11e95235a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 18a9b2510..6658d273c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21562.1 + 6.0.0-beta.21609.4 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c68..a16e18b17 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -188,9 +188,6 @@ function InitializeCustomToolset { function Build { - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5..b1bca63ab 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2b55a567f..069098b0a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages @@ -64,6 +65,8 @@ jobs: ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 444842899..f1e1cb539 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -301,31 +298,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } - } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed + } else { + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break + } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -882,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef7..e555c3426 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them - local runtimeSourceFeedKey='' + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) + + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) + fi + fi + + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code - fi - } + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -399,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index e6d26905e..86e408bbe 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21562.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21609.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21609.4" } } From 0ce201ed68d1fa0b397531084d12ccf6bc82b91f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:04:25 +0000 Subject: [PATCH 178/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12841) [release/6.0.2xx] 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 11e95235a..e96c241f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - e025965a8e463030d890739043b6e64b41a5de84 + 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe From 6dc017e0d982deaed7fa4bdf3ba749eaa3aa207a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Dec 2021 14:32:13 -0800 Subject: [PATCH 179/239] Update asp.net template versions (#12765) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6658d273c..4f5399580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.12 + 5.0.13 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.21 + 3.1.22 3.2.1 4.8.0-rc2.19462.10 From 858406127a6b7be76787bc8f538218d7d18c7214 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:40:54 +0000 Subject: [PATCH 180/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.2 (#12843) [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 dd7be4dc3..0c24a9de8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade bcd6e007b9f53be0a7aff804d5c17ea7e179317b - + https://github.com/dotnet/source-build-reference-packages - 6e776828ab897d3e76ea1adf8b1a4c859f70cc0c + f97feec7ce30327758926cfad6057dc626ecf443 From 8b9782a074c51ef9f8b8b0608870c23ed77df7f5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Dec 2021 14:56:20 -0800 Subject: [PATCH 181/239] Update asp.net templates (#12766) * Update asp.net templates * Update GenerateBundledVersions.targets --- eng/Versions.props | 6 +++--- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b58584d59..a56a42302 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,14 +123,14 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.0 + 6.0.1 $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.12 + 5.0.13 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -138,7 +138,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.21 + 3.1.22 3.2.1 4.8.0-rc2.19462.10 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 92534418b..753aa6984 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 21 - 12 + 22 + 13 From 360e2cff8664aff90e6f070b6a456d1898421887 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 23:51:54 +0000 Subject: [PATCH 182/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12844) [release/6.0.2xx] 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 e96c241f3..44ae65f6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe + 371b3c7cb21a14ca703a6c6b966c4ce83d6902a2 From 2a5285a5b0b6da7ebce2f1ba9552a5f9be1d7902 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 00:47:14 +0000 Subject: [PATCH 183/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.4 (#12846) [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 0c24a9de8..7d8c77451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade bcd6e007b9f53be0a7aff804d5c17ea7e179317b - + https://github.com/dotnet/source-build-reference-packages - f97feec7ce30327758926cfad6057dc626ecf443 + 09f9a4a8d665ffcf10fb9a7407c7058aacaabbb6 From 093cc49bb2be2ab6b8d4fc2316ecb482c5f548af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 14:25:54 +0000 Subject: [PATCH 184/239] Update dependencies from https://github.com/dotnet/arcade build 20211214.1 (#12848) [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 7d8c77451..4b0c1b098 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - bcd6e007b9f53be0a7aff804d5c17ea7e179317b + cc0fa942bf43c2814af778868d4e7ddf21146b96 - + https://github.com/dotnet/arcade - bcd6e007b9f53be0a7aff804d5c17ea7e179317b + cc0fa942bf43c2814af778868d4e7ddf21146b96 - + https://github.com/dotnet/arcade - bcd6e007b9f53be0a7aff804d5c17ea7e179317b + cc0fa942bf43c2814af778868d4e7ddf21146b96 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a56a42302..227464fbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21613.2 + 7.0.0-beta.21614.1 diff --git a/global.json b/global.json index 46a040a41..ec70e5a02 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.21613.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21613.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21614.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21614.1" } } From d8c872358967088e5337ccf1fb6407293f18c416 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 01:35:34 +0000 Subject: [PATCH 185/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211215.1 (#12851) [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 4b0c1b098..cd6aa29b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade cc0fa942bf43c2814af778868d4e7ddf21146b96 - + https://github.com/dotnet/source-build-reference-packages - 09f9a4a8d665ffcf10fb9a7407c7058aacaabbb6 + f61166c18691bd017d88198f30a22e289231381a From 3841d37fd7a815749c1b40e77c1c46dac56d2419 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 15 Dec 2021 22:41:31 -0800 Subject: [PATCH 186/239] Removed the annotation --- .../eng/common/templates/job/source-build-run-tarball-build.yml | 1 - 1 file changed, 1 deletion(-) 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 index 78be18466..a5487fd5e 100644 --- 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 @@ -39,7 +39,6 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: Fedora33-Offline: _BuildArch: x64 From c3c6d22d96c1deb95d74865b2710f9fd62aed075 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 14:31:40 +0000 Subject: [PATCH 187/239] Update dependencies from https://github.com/dotnet/arcade build 20211215.1 (#12853) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21518.1 to 1.0.0-beta.21614.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 cd6aa29b8..049b2a0a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - cc0fa942bf43c2814af778868d4e7ddf21146b96 + 943d03f62955c771825dfa1f1bdeb8f853a2d7dd - + https://github.com/dotnet/arcade - cc0fa942bf43c2814af778868d4e7ddf21146b96 + 943d03f62955c771825dfa1f1bdeb8f853a2d7dd - + https://github.com/dotnet/arcade - cc0fa942bf43c2814af778868d4e7ddf21146b96 + 943d03f62955c771825dfa1f1bdeb8f853a2d7dd https://github.com/dotnet/source-build-reference-packages @@ -196,9 +196,9 @@ 9c298b01ce0f161622bef0bc0c433a758d0dd3ac - + https://github.com/dotnet/xliff-tasks - 8bf78e6a8537ba89c23fbd1f2f219e5ab4d2a812 + 59de228256462700a375bf4a31af19362355dd12 diff --git a/eng/Versions.props b/eng/Versions.props index 227464fbb..c6d1a08ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21614.1 + 7.0.0-beta.21615.1 diff --git a/global.json b/global.json index ec70e5a02..6bbc574a3 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.21614.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21614.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21615.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21615.1" } } From bf6031f2419418e82ad2ba82d3ad57e1745d4f00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:34:04 +0000 Subject: [PATCH 188/239] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211216.2 (#12856) [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 049b2a0a3..80c9e077a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/arcade 943d03f62955c771825dfa1f1bdeb8f853a2d7dd - + https://github.com/dotnet/source-build-reference-packages - f61166c18691bd017d88198f30a22e289231381a + 5a659cd9117a398098779cfd75bdd86c1214c669 From 3623697db02f34023fd41e1b06dde2f9049138f1 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 16 Dec 2021 18:50:12 -0800 Subject: [PATCH 189/239] Remove changes to file source-build-run-tarball-build.yml --- .../templates/job/source-build-run-tarball-build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 index a5487fd5e..afe11415a 100644 --- 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 @@ -39,11 +39,10 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Fedora33-Offline: - _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} - _RunOnline: false + Fedora33-Offline: + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 workspace: clean: all From ef80dcb010fe88dbb772589d474a99b4bb1512a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 21:28:08 +0000 Subject: [PATCH 190/239] [main] Update dependencies from dotnet/sdk (#12826) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21613.3 to 7.0.100-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21613.3 to 7.0.100-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21609.2 to 7.0.0-alpha.1.21615.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21615.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211214-01 to 17.2.0-preview-20211214-03 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21613.2 to 7.0.100-1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Update default tf from winforms templates. --- eng/Version.Details.xml | 100 ++++++++++++++--------------- eng/Versions.props | 46 ++++++------- test/EndToEnd/ProjectBuildTests.cs | 13 +++- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c9e077a..952f6097d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e https://github.com/dotnet/test-templates @@ -90,32 +90,32 @@ 46638329316539e78e8b6fd9ffbe549132eedbe6 - + https://github.com/dotnet/templating - e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 + 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/templating - e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 + 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/sdk - e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 + d5579a92bc14ad579f05cbbbdb342ca5930afb08 - + https://github.com/dotnet/sdk - e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 + d5579a92bc14ad579f05cbbbdb342ca5930afb08 - + https://github.com/dotnet/winforms - e283294aefed00a944d0f8e0345859fdc2425a1c + fe12fe1b90a19dba5136505b91172af39d06b09f - + https://github.com/dotnet/wpf - 82383246cc675d61b48b79eaf1a06550cec11cdd + a80b76e3bd81aab6379165456bdc2412a787d171 https://github.com/dotnet/fsharp @@ -126,14 +126,14 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 4a77384e324e8a7bd874346a9fc34fdd6f8101ae + 0a43b14b616e57e94a34040ca3d2a211bfbe4c5a - + https://github.com/dotnet/linker - 9781aeb54d1741f421ea3340dafae3526b34e8fe + 853385633a7aeb84d9bd81885b3b221fc3075038 linker diff --git a/eng/Versions.props b/eng/Versions.props index c6d1a08ba..57baa6e05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-alpha.1.21609.2 + 7.0.0-alpha.1.21615.7 - 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21615.8 - 7.0.100-alpha.1.21613.3 + 7.0.100-alpha.1.21617.2 @@ -51,44 +51,44 @@ - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 0.2.0 - 7.0.100-alpha.1.21614.4 - 7.0.100-alpha.1.21614.4 + 7.0.100-alpha.1.21617.6 + 7.0.100-alpha.1.21617.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 2.1.0 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211214-01 + 17.2.0-preview-20211214-03 diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 4413f2973..a2d8d3b99 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -361,7 +361,7 @@ namespace EndToEnd.Tests [InlineData("winformscontrollib", "VB")] public void ItCanCreateAndBuildTemplatesWithDefaultFramework_Windows(string templateName, string language = "") { - string framework = DetectExpectedDefaultFramework(); + string framework = DetectExpectedDefaultFramework(templateName); TestTemplateCreateAndBuild(templateName, selfContained: true, language: language, framework: $"{framework}-windows"); } @@ -386,7 +386,7 @@ namespace EndToEnd.Tests } } - private static string DetectExpectedDefaultFramework() + private static string DetectExpectedDefaultFramework(string template = "") { string dotnetFolder = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); string[] runtimeFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "shared", "Microsoft.NETCore.App")); @@ -394,9 +394,16 @@ namespace EndToEnd.Tests int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max(); if (latestMajorVersion == 7) { - // TODO: Update + // TODO: This block need to be updated when every template updates their default tfm. + // Currently winforms updated their default templates target but not others. + if (template.StartsWith("winforms")) + { + return $"net{latestMajorVersion}.0"; + } + return "net6.0"; } + throw new Exception("Unsupported version of SDK"); } From 9ed1dfec9802fedfde5e076ae1896df8d8fff5c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 02:17:08 +0000 Subject: [PATCH 191/239] [main] Update dependencies from dotnet/sdk (#12861) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21616.8 to 7.0.0-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21616.17 to 7.0.0-alpha.1.21617.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 952f6097d..a65800550 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b338078cbbff08f809b1d73825e420157f4d81e3 + dda44e1ede5853ca2f96350d411a1777bc8fa9c7 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 - + https://github.com/dotnet/aspnetcore - d434a4d205cd0da5d0b91af75c1195119197ea6e + 15659e25dec749e712d789516980625b5d473a62 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/sdk - d5579a92bc14ad579f05cbbbdb342ca5930afb08 + f22b9c002b17d54d4f48218007b90e215278b433 - + https://github.com/dotnet/sdk - d5579a92bc14ad579f05cbbbdb342ca5930afb08 + f22b9c002b17d54d4f48218007b90e215278b433 diff --git a/eng/Versions.props b/eng/Versions.props index 57baa6e05..9d1216b3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,36 +51,36 @@ - 7.0.0-alpha.1.21616.8 - 7.0.0-alpha.1.21616.8 - 7.0.0-alpha.1.21616.8 - 7.0.0-alpha.1.21616.8 - 7.0.0-alpha.1.21616.8 - 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21617.2 0.2.0 - 7.0.100-alpha.1.21617.6 - 7.0.100-alpha.1.21617.6 + 7.0.100-alpha.1.21617.8 + 7.0.100-alpha.1.21617.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21617.1 2.1.0 From e1141baa0ed02ba80029d9b15d60c642f2656ad7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 15:18:59 +0000 Subject: [PATCH 192/239] Update dependencies from https://github.com/dotnet/arcade build 20211217.4 (#12863) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.1-beta-21579-02 to 1.2.0-beta-21616-04 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21614.1 to 1.0.0-beta.21616.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a65800550..b90eb0723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,33 +172,33 @@ - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 78659a1d4831ce9d62ea817fe13e4e2e70a52961 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 78659a1d4831ce9d62ea817fe13e4e2e70a52961 - + https://github.com/dotnet/arcade - 943d03f62955c771825dfa1f1bdeb8f853a2d7dd + 78659a1d4831ce9d62ea817fe13e4e2e70a52961 https://github.com/dotnet/source-build-reference-packages 5a659cd9117a398098779cfd75bdd86c1214c669 - + https://github.com/dotnet/sourcelink - 9c298b01ce0f161622bef0bc0c433a758d0dd3ac + fd61d7b341e28abd71cf73083b83dc95eb5694cb - + https://github.com/dotnet/xliff-tasks - 59de228256462700a375bf4a31af19362355dd12 + eb27bf615b1c70018e3209384c76c45eb5c3f4f4 diff --git a/eng/Versions.props b/eng/Versions.props index 9d1216b3a..52c1f68b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21615.1 + 7.0.0-beta.21617.4 diff --git a/global.json b/global.json index 6bbc574a3..8c3cdbf04 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.21615.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21615.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21617.4" } } From ffa7eba861ed9d327abbe05d740e9b9ac55c42bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 04:48:24 +0000 Subject: [PATCH 193/239] [main] Update dependencies from dotnet/sdk (#12864) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21616.1 to 7.0.0-alpha.1.21618.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21616.1 to 7.0.0-alpha.1.21618.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21616.1 to 7.0.0-alpha.1.21618.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21617.2 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21616.1 to 7.0.0-alpha.1.21618.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21615.7 to 7.0.0-alpha.1.21618.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21616.1 to 7.0.0-alpha.1.21618.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21615.8 to 7.0.0-alpha.1.21618.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21617.1 to 7.0.0-alpha.1.21618.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++----------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b90eb0723..9d66e1ec0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 + 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/windowsdesktop - 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 + 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/windowsdesktop - 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 + 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/windowsdesktop - 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 + 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - dda44e1ede5853ca2f96350d411a1777bc8fa9c7 + 7213976bceee360ceeb68b336aaed90c204fd3b7 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/aspnetcore - 15659e25dec749e712d789516980625b5d473a62 + 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 https://github.com/dotnet/test-templates @@ -99,23 +99,23 @@ 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/sdk - f22b9c002b17d54d4f48218007b90e215278b433 + e587402ebcd707d2974bb3ad1cd9b6c21b26e190 - + https://github.com/dotnet/sdk - f22b9c002b17d54d4f48218007b90e215278b433 + e587402ebcd707d2974bb3ad1cd9b6c21b26e190 - + https://github.com/dotnet/winforms - fe12fe1b90a19dba5136505b91172af39d06b09f + 6766f3edf0ab99bf64aa0243f6125caa5fba7344 - + https://github.com/dotnet/wpf - a80b76e3bd81aab6379165456bdc2412a787d171 + 308bb19d6ab4f7c267abab95b4b2dcbe28d48e52 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 52c1f68b6..f0ec34df2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21615.7 + 7.0.0-alpha.1.21618.1 - 7.0.0-alpha.1.21615.8 + 7.0.0-alpha.1.21618.2 @@ -51,44 +51,44 @@ - 7.0.0-alpha.1.21617.2 - 7.0.0-alpha.1.21617.2 - 7.0.0-alpha.1.21617.2 - 7.0.0-alpha.1.21617.2 - 7.0.0-alpha.1.21617.2 - 7.0.0-alpha.1.21617.2 + 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21618.2 0.2.0 - 7.0.100-alpha.1.21617.8 - 7.0.100-alpha.1.21617.8 + 7.0.100-alpha.1.21619.2 + 7.0.100-alpha.1.21619.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21617.1 - 7.0.0-alpha.1.21617.1 + 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21618.4 2.1.0 - 7.0.0-alpha.1.21616.1 - 7.0.0-alpha.1.21616.1 - 7.0.0-alpha.1.21616.1 - 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21618.3 + 7.0.0-alpha.1.21618.3 + 7.0.0-alpha.1.21618.3 + 7.0.0-alpha.1.21618.3 From 98ebc105a925488c0e74b3ff77da79eceb0d8b17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 05:50:03 +0000 Subject: [PATCH 194/239] Update dependencies from https://github.com/dotnet/sdk build 20211219.5 (#12865) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21573.5 to 4.0.1-1.21619.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d66e1ec0..495b5d998 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/sdk - e587402ebcd707d2974bb3ad1cd9b6c21b26e190 + 489a8736672df81aeca134f68284498884bc3315 - + https://github.com/dotnet/sdk - e587402ebcd707d2974bb3ad1cd9b6c21b26e190 + 489a8736672df81aeca134f68284498884bc3315 @@ -137,9 +137,9 @@ linker - + https://github.com/dotnet/roslyn - 1fa6e45dd631b37e7b28a78907240aed8a300d50 + 4bc1f9a38a54283007b9ba142f032ddc2e111cf4 diff --git a/eng/Versions.props b/eng/Versions.props index f0ec34df2..5ba9d3fe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21619.2 - 7.0.100-alpha.1.21619.2 + 7.0.100-alpha.1.21619.5 + 7.0.100-alpha.1.21619.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a530c39c62710bcba00f9ba6baa5a1e8d6be6228 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 14:31:16 +0000 Subject: [PATCH 195/239] Update dependencies from https://github.com/dotnet/test-templates build 20211220.1 (#12867) [main] 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 495b5d998..6cf2c4f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/test-templates - 46638329316539e78e8b6fd9ffbe549132eedbe6 + 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 - + https://github.com/dotnet/test-templates - 46638329316539e78e8b6fd9ffbe549132eedbe6 + 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 - + https://github.com/dotnet/test-templates - 46638329316539e78e8b6fd9ffbe549132eedbe6 + 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 diff --git a/eng/Versions.props b/eng/Versions.props index 5ba9d3fe9..11a6ae59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ - 1.0.2-beta4.21613.2 - 1.0.2-beta4.21613.2 + 1.0.2-beta4.21620.1 + 1.0.2-beta4.21620.1 @@ -152,7 +152,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21613.2 + 1.0.2-beta4.21620.1 2.1.30 From 9b5623bee14e1a391c89aabc1990c74e89c0c476 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:36:40 +0000 Subject: [PATCH 196/239] [main] Update dependencies from dotnet/sdk (#12866) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Remove obsolete sourcelink patch It was merged upstream in https://github.com/dotnet/format/pull/1444 --- eng/Version.Details.xml | 16 ++--- eng/Versions.props | 6 +- .../0001-Fix-MicrosoftExtensionsVersion.patch | 68 ------------------- 3 files changed, 11 insertions(+), 79 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cf2c4f1e..b16fca2c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 - + https://github.com/dotnet/templating - 183ba8d147f2ec507a867df8f677927b6c18e9ae + 570f140e6fe335fd5b03d30add315bd0393b19a5 - + https://github.com/dotnet/templating - 183ba8d147f2ec507a867df8f677927b6c18e9ae + 570f140e6fe335fd5b03d30add315bd0393b19a5 - + https://github.com/dotnet/sdk - 489a8736672df81aeca134f68284498884bc3315 + 3a252163f9cbe2b7956d75ff2991a3272a50dfd8 - + https://github.com/dotnet/sdk - 489a8736672df81aeca134f68284498884bc3315 + 3a252163f9cbe2b7956d75ff2991a3272a50dfd8 diff --git a/eng/Versions.props b/eng/Versions.props index 11a6ae59b..cfa327742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21617.2 + 7.0.100-alpha.1.21620.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21619.5 - 7.0.100-alpha.1.21619.5 + 7.0.100-alpha.1.21620.1 + 7.0.100-alpha.1.21620.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch deleted file mode 100644 index 80fb51c59..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 22 Oct 2021 13:26:33 -0500 -Subject: [PATCH] Fix MicrosoftExtensionsVersion - -Move it to eng/Versions.props to make it overridable, and rename it to match an -actual package ID. - -Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be -source-compatible with the 6.0 version of these packages. - -See https://github.com/dotnet/format/issues/1400 ---- - Directory.Packages.props | 7 +++---- - eng/Versions.props | 1 + - src/Logging/SimpleConsoleLogger.cs | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c2..9b579ea 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -2,7 +2,6 @@ - - - -- 5.0.0 - - 6.0.0-rc.278 - -@@ -25,9 +24,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index b1990aa..f6ddbbd 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -15,6 +15,7 @@ - - 16.11.0 - 3.3.2 -+ 5.0.0 - - 4.0.0-6.21526.21 - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index c361f84..fd8015c 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging - _minimalErrorLevel = minimalErrorLevel; - } - -- public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) -+ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) - { - if (!IsEnabled(logLevel)) - { From 74398604860715c00c183ab13b549d6402c4328a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 20:21:32 +0000 Subject: [PATCH 197/239] Update dependencies from https://github.com/dotnet/sdk build 20211220.2 (#12868) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21616.1 to 7.0.100-1.21620.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b16fca2c0..368b8a725 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 570f140e6fe335fd5b03d30add315bd0393b19a5 - + https://github.com/dotnet/sdk - 3a252163f9cbe2b7956d75ff2991a3272a50dfd8 + 1498a3a4a471bf9c9ff9cf679907c16e54922eba - + https://github.com/dotnet/sdk - 3a252163f9cbe2b7956d75ff2991a3272a50dfd8 + 1498a3a4a471bf9c9ff9cf679907c16e54922eba @@ -131,9 +131,9 @@ 0a43b14b616e57e94a34040ca3d2a211bfbe4c5a - + https://github.com/dotnet/linker - 853385633a7aeb84d9bd81885b3b221fc3075038 + 41467d340a3345f08cb8ba67c20c1ea40c57682f linker diff --git a/eng/Versions.props b/eng/Versions.props index cfa327742..fb3f3bd35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21620.1 - 7.0.100-alpha.1.21620.1 + 7.0.100-alpha.1.21620.2 + 7.0.100-alpha.1.21620.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5d2f54250c50c5f5d630b71a436d0e1acbf9752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 20:24:25 +0000 Subject: [PATCH 198/239] Update dependencies from https://github.com/dotnet/test-templates build 20211220.2 (#12869) [main] 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 368b8a725..c5c5d90c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 - + https://github.com/dotnet/test-templates - 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 + f5f8cf4b2e3234428730e64162af51abd67551fe - + https://github.com/dotnet/test-templates - 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 + f5f8cf4b2e3234428730e64162af51abd67551fe - + https://github.com/dotnet/test-templates - 1a2d5a38e12a511dbcd888b0e78b7ed798ad3706 + f5f8cf4b2e3234428730e64162af51abd67551fe diff --git a/eng/Versions.props b/eng/Versions.props index fb3f3bd35..6c57a5fe1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ - 1.0.2-beta4.21620.1 - 1.0.2-beta4.21620.1 + 1.0.2-beta4.21620.2 + 1.0.2-beta4.21620.2 @@ -152,7 +152,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21620.1 + 1.0.2-beta4.21620.2 2.1.30 From fc46b4932aab36b062c0baf8cc73db01f15be79f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:36:42 +0000 Subject: [PATCH 199/239] Update dependencies from https://github.com/dotnet/sdk build 20211220.3 (#12870) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21620.1 to 7.0.100-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21620.1 to 7.0.100-alpha.1.21620.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 c5c5d90c8..92db7dff1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ f5f8cf4b2e3234428730e64162af51abd67551fe - + https://github.com/dotnet/templating - 570f140e6fe335fd5b03d30add315bd0393b19a5 + 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/templating - 570f140e6fe335fd5b03d30add315bd0393b19a5 + 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/sdk - 1498a3a4a471bf9c9ff9cf679907c16e54922eba + 25da7a40ce4e433d900ff11e2ec412b7fc49fe17 - + https://github.com/dotnet/sdk - 1498a3a4a471bf9c9ff9cf679907c16e54922eba + 25da7a40ce4e433d900ff11e2ec412b7fc49fe17 diff --git a/eng/Versions.props b/eng/Versions.props index 6c57a5fe1..0149e93e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21620.1 + 7.0.100-alpha.1.21620.2 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21620.2 - 7.0.100-alpha.1.21620.2 + 7.0.100-alpha.1.21620.3 + 7.0.100-alpha.1.21620.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 135e07598410d90c3ed027e42be9c1f130b58999 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 05:49:26 +0000 Subject: [PATCH 200/239] [main] Update dependencies from dotnet/sdk (#12872) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21618.4 to 7.0.0-alpha.1.21620.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92db7dff1..b2aae637d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7213976bceee360ceeb68b336aaed90c204fd3b7 + 834b278911962102919b3a7dec22ca6cb26bfa8a - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 - + https://github.com/dotnet/aspnetcore - 42c0b6a7cfcf8989f4bfbd5f102f07084a9febc8 + a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/sdk - 25da7a40ce4e433d900ff11e2ec412b7fc49fe17 + 6c7b03537b6829e85acf46fad491445d0ee45e2a - + https://github.com/dotnet/sdk - 25da7a40ce4e433d900ff11e2ec412b7fc49fe17 + 6c7b03537b6829e85acf46fad491445d0ee45e2a diff --git a/eng/Versions.props b/eng/Versions.props index 0149e93e5..d7cf66944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,36 +51,36 @@ - 7.0.0-alpha.1.21618.2 - 7.0.0-alpha.1.21618.2 - 7.0.0-alpha.1.21618.2 - 7.0.0-alpha.1.21618.2 - 7.0.0-alpha.1.21618.2 - 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21620.3 0.2.0 - 7.0.100-alpha.1.21620.3 - 7.0.100-alpha.1.21620.3 + 7.0.100-alpha.1.21620.5 + 7.0.100-alpha.1.21620.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21618.4 - 7.0.0-alpha.1.21618.4 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.1 2.1.0 From d56e6e80f736c4240204a9d6aa63cc23e8c18deb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 14:21:59 +0000 Subject: [PATCH 201/239] Update dependencies from https://github.com/dotnet/arcade build 20211220.2 (#12873) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/dotnet-install.sh | 3 +++ eng/common/native/CommonLibrary.psm1 | 3 ++- global.json | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2aae637d..f3d9b2a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d7cf66944..8ad89ee50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21617.4 + 7.0.0-beta.21620.2 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..5c94e9863 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -55,6 +55,9 @@ case $cpuname in aarch64) buildarch=arm64 ;; + loongarch64) + buildarch=loongarch64 + ;; amd64|x86_64) buildarch=x64 ;; diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index adf707c8f..ca38268c4 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -276,7 +276,8 @@ function Get-MachineArchitecture { } if (($ProcessorArchitecture -Eq "AMD64") -Or ($ProcessorArchitecture -Eq "IA64") -Or - ($ProcessorArchitecture -Eq "ARM64")) { + ($ProcessorArchitecture -Eq "ARM64") -Or + ($ProcessorArchitecture -Eq "LOONGARCH64")) { return "x64" } return "x86" diff --git a/global.json b/global.json index 8c3cdbf04..45193adfc 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.21617.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21617.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21620.2" } } From d0e5f2d7cce93c8df8bf6185d1bd680b24343609 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:10:49 +0000 Subject: [PATCH 202/239] Update dependencies from https://github.com/dotnet/sdk build 20211221.1 (#12874) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21620.1 to 7.0.0-alpha.1.21620.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3d9b2a31..7198b5b69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 5711b2bbcfff77942a52929b80fa9f37444d2421 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + 72bee25ab532a4d0636118ec2ed3eabf3fd55245 https://github.com/dotnet/aspnetcore @@ -99,14 +99,14 @@ 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/sdk - 6c7b03537b6829e85acf46fad491445d0ee45e2a + a67eadae54e58fb63282c5a3d4ca265e7aad8ff3 - + https://github.com/dotnet/sdk - 6c7b03537b6829e85acf46fad491445d0ee45e2a + a67eadae54e58fb63282c5a3d4ca265e7aad8ff3 diff --git a/eng/Versions.props b/eng/Versions.props index 8ad89ee50..219298dd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,24 +63,24 @@ - 7.0.100-alpha.1.21620.5 - 7.0.100-alpha.1.21620.5 + 7.0.100-alpha.1.21621.1 + 7.0.100-alpha.1.21621.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21620.7 2.1.0 From a0fe91a1244700af1c9209761e1cfd0e7158a76d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 03:14:14 +0000 Subject: [PATCH 203/239] Update dependencies from https://github.com/dotnet/sdk build 20211221.4 (#12875) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21618.3 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21618.3 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21618.3 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21620.3 to 7.0.0-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21618.3 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21618.1 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21618.3 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21618.2 to 7.0.0-alpha.1.21620.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7198b5b69..54ff7d984 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 5711b2bbcfff77942a52929b80fa9f37444d2421 + 08c2775624a42be2e06f14a9c1992f7b223230ad - + https://github.com/dotnet/windowsdesktop - 5711b2bbcfff77942a52929b80fa9f37444d2421 + 08c2775624a42be2e06f14a9c1992f7b223230ad - + https://github.com/dotnet/windowsdesktop - 5711b2bbcfff77942a52929b80fa9f37444d2421 + 08c2775624a42be2e06f14a9c1992f7b223230ad - + https://github.com/dotnet/windowsdesktop - 5711b2bbcfff77942a52929b80fa9f37444d2421 + 08c2775624a42be2e06f14a9c1992f7b223230ad https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 72bee25ab532a4d0636118ec2ed3eabf3fd55245 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/aspnetcore - a3adc142f403cfa3f69d11b9f75c3daa4425d1b4 + 0d91a50aba7fe754b6c1044c276f0c72e4e06719 https://github.com/dotnet/test-templates @@ -99,23 +99,23 @@ 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/sdk - a67eadae54e58fb63282c5a3d4ca265e7aad8ff3 + bf63be65a49e7b4e5fc390b05496fa51c51f6c08 - + https://github.com/dotnet/sdk - a67eadae54e58fb63282c5a3d4ca265e7aad8ff3 + bf63be65a49e7b4e5fc390b05496fa51c51f6c08 - + https://github.com/dotnet/winforms - 6766f3edf0ab99bf64aa0243f6125caa5fba7344 + 1f61d8f2612b8aab1d564aec76edffc4559cc23a - + https://github.com/dotnet/wpf - 308bb19d6ab4f7c267abab95b4b2dcbe28d48e52 + a205e94ca16a62dde1ea7ee9442ed862573a9472 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 219298dd3..a9a3bead1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21618.1 + 7.0.0-alpha.1.21620.2 - 7.0.0-alpha.1.21618.2 + 7.0.0-alpha.1.21620.2 @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21620.3 - 7.0.0-alpha.1.21620.3 - 7.0.0-alpha.1.21620.3 - 7.0.0-alpha.1.21620.3 - 7.0.0-alpha.1.21620.3 - 7.0.0-alpha.1.21620.3 + 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21621.1 0.2.0 - 7.0.100-alpha.1.21621.1 - 7.0.100-alpha.1.21621.1 + 7.0.100-alpha.1.21621.4 + 7.0.100-alpha.1.21621.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -85,10 +85,10 @@ - 7.0.0-alpha.1.21618.3 - 7.0.0-alpha.1.21618.3 - 7.0.0-alpha.1.21618.3 - 7.0.0-alpha.1.21618.3 + 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21620.2 From fbd97ae3302e670151ea3b23c8a16cb8b73f5131 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 04:36:18 +0000 Subject: [PATCH 204/239] Update dependencies from https://github.com/dotnet/sdk build 20211221.5 (#12876) [main] Update dependencies from dotnet/sdk --- 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 54ff7d984..7d59f5689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 - + https://github.com/dotnet/sdk - bf63be65a49e7b4e5fc390b05496fa51c51f6c08 + 9c28232a22b028528b72b26f2d37931c0831fbf1 - + https://github.com/dotnet/sdk - bf63be65a49e7b4e5fc390b05496fa51c51f6c08 + 9c28232a22b028528b72b26f2d37931c0831fbf1 diff --git a/eng/Versions.props b/eng/Versions.props index a9a3bead1..f8314cdf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21621.4 - 7.0.100-alpha.1.21621.4 + 7.0.100-alpha.1.21621.5 + 7.0.100-alpha.1.21621.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 16466ff0c552b2699c8bd9d9ab27e3765f10b150 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 05:43:45 +0000 Subject: [PATCH 205/239] Update dependencies from https://github.com/dotnet/sdk build 20211221.6 (#12877) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21620.2 to 7.0.100-alpha.1.21621.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21620.2 to 7.0.100-alpha.1.21621.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 7d59f5689..4cfdf4c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ f5f8cf4b2e3234428730e64162af51abd67551fe - + https://github.com/dotnet/templating - 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 + 715c2543709ca4426b26f35f0dcb54d75fb9895f - + https://github.com/dotnet/templating - 0cd5c5c6b7da88ccf19338d0ab36a9b4d59e9a56 + 715c2543709ca4426b26f35f0dcb54d75fb9895f - + https://github.com/dotnet/sdk - 9c28232a22b028528b72b26f2d37931c0831fbf1 + dae65f6f54323741f73da879bbc06fd5ec321db7 - + https://github.com/dotnet/sdk - 9c28232a22b028528b72b26f2d37931c0831fbf1 + dae65f6f54323741f73da879bbc06fd5ec321db7 diff --git a/eng/Versions.props b/eng/Versions.props index f8314cdf9..02f75a197 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21620.2 + 7.0.100-alpha.1.21621.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21621.5 - 7.0.100-alpha.1.21621.5 + 7.0.100-alpha.1.21621.6 + 7.0.100-alpha.1.21621.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9893d93dfea0aad3cc116507db0362a703ecb80b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 11:07:53 +0000 Subject: [PATCH 206/239] Update dependencies from https://github.com/dotnet/test-templates build 20211222.1 (#12878) [main] 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 4cfdf4c82..478bcd885 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/aspnetcore 0d91a50aba7fe754b6c1044c276f0c72e4e06719 - + https://github.com/dotnet/test-templates - f5f8cf4b2e3234428730e64162af51abd67551fe + aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/test-templates - f5f8cf4b2e3234428730e64162af51abd67551fe + aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/test-templates - f5f8cf4b2e3234428730e64162af51abd67551fe + aef25c8e45e2ab42294cef1b37e3657c118d74b7 diff --git a/eng/Versions.props b/eng/Versions.props index 02f75a197..93536f9a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ - 1.0.2-beta4.21620.2 - 1.0.2-beta4.21620.2 + 1.0.2-beta4.21622.1 + 1.0.2-beta4.21622.1 @@ -152,7 +152,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21620.2 + 1.0.2-beta4.21622.1 2.1.30 From 895fec8269449a6a642dab1c4449e6d17059cc0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:15:49 +0000 Subject: [PATCH 207/239] Update dependencies from https://github.com/dotnet/arcade build 20211221.3 (#12879) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-21616-04 to 1.2.0-beta-21617-01 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21616.1 to 1.0.0-beta.21618.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 478bcd885..ee2df916e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,33 +172,33 @@ - + https://github.com/dotnet/arcade - 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 + 0cd94b1d02c03377d99f3739beb191591f6abee5 - + https://github.com/dotnet/arcade - 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 + 0cd94b1d02c03377d99f3739beb191591f6abee5 https://github.com/dotnet/source-build-reference-packages 5a659cd9117a398098779cfd75bdd86c1214c669 - + https://github.com/dotnet/sourcelink fd61d7b341e28abd71cf73083b83dc95eb5694cb - + https://github.com/dotnet/xliff-tasks - eb27bf615b1c70018e3209384c76c45eb5c3f4f4 + 6a28b6d9a37488168d2063a1d55ac5c89f053c1b diff --git a/eng/Versions.props b/eng/Versions.props index 93536f9a2..90920271c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21620.2 + 7.0.0-beta.21621.3 diff --git a/global.json b/global.json index 45193adfc..d93ff28b8 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.21620.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21620.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21621.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21621.3" } } From 3bcd5e5197209db1f34346e2137baa6a0fa4c6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 17:35:12 +0000 Subject: [PATCH 208/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.1 (#12880) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21620.2 to 7.0.0-alpha.1.21621.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21620.7 to 7.0.0-alpha.1.21621.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee2df916e..b0e8be6f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 08c2775624a42be2e06f14a9c1992f7b223230ad + e74d4009f23eded92e12fc74ab6eb135b867b108 - + https://github.com/dotnet/windowsdesktop - 08c2775624a42be2e06f14a9c1992f7b223230ad + e74d4009f23eded92e12fc74ab6eb135b867b108 - + https://github.com/dotnet/windowsdesktop - 08c2775624a42be2e06f14a9c1992f7b223230ad + e74d4009f23eded92e12fc74ab6eb135b867b108 - + https://github.com/dotnet/windowsdesktop - 08c2775624a42be2e06f14a9c1992f7b223230ad + e74d4009f23eded92e12fc74ab6eb135b867b108 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 72bee25ab532a4d0636118ec2ed3eabf3fd55245 + 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 https://github.com/dotnet/aspnetcore @@ -99,23 +99,23 @@ 715c2543709ca4426b26f35f0dcb54d75fb9895f - + https://github.com/dotnet/sdk - dae65f6f54323741f73da879bbc06fd5ec321db7 + 3c46b7477137a60ff24b8daf256034c2c251d797 - + https://github.com/dotnet/sdk - dae65f6f54323741f73da879bbc06fd5ec321db7 + 3c46b7477137a60ff24b8daf256034c2c251d797 - + https://github.com/dotnet/winforms - 1f61d8f2612b8aab1d564aec76edffc4559cc23a + b2f12fddc038c8e04717f895a63aae72778b0a28 - + https://github.com/dotnet/wpf - a205e94ca16a62dde1ea7ee9442ed862573a9472 + ea4cd5a567b545fadd8ed1e357e8cd78ff710a6f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 90920271c..09ea83111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21621.5 - 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21621.5 @@ -63,32 +63,32 @@ - 7.0.100-alpha.1.21621.6 - 7.0.100-alpha.1.21621.6 + 7.0.100-alpha.1.21622.1 + 7.0.100-alpha.1.21622.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.7 - 7.0.0-alpha.1.21620.7 + 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21621.3 2.1.0 - 7.0.0-alpha.1.21620.2 - 7.0.0-alpha.1.21620.2 - 7.0.0-alpha.1.21620.2 - 7.0.0-alpha.1.21620.2 + 7.0.0-alpha.1.21621.6 + 7.0.0-alpha.1.21621.6 + 7.0.0-alpha.1.21621.6 + 7.0.0-alpha.1.21621.6 From ba3468d2f907d59c577d27aef20b03bd59a64fd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 18:31:03 +0000 Subject: [PATCH 209/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.2 (#12881) [main] Update dependencies from dotnet/sdk --- 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 b0e8be6f1..aa1110922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 715c2543709ca4426b26f35f0dcb54d75fb9895f - + https://github.com/dotnet/sdk - 3c46b7477137a60ff24b8daf256034c2c251d797 + cb394a0d9869be323ab7fad0a48ac9ee31a4dc47 - + https://github.com/dotnet/sdk - 3c46b7477137a60ff24b8daf256034c2c251d797 + cb394a0d9869be323ab7fad0a48ac9ee31a4dc47 diff --git a/eng/Versions.props b/eng/Versions.props index 09ea83111..8077a55e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21622.1 - 7.0.100-alpha.1.21622.1 + 7.0.100-alpha.1.21622.2 + 7.0.100-alpha.1.21622.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5d5f348fecce8e03600dcc67953680f27915b237 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 19:55:45 +0000 Subject: [PATCH 210/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.3 (#12882) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21621.1 to 7.0.100-alpha.1.21622.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21621.1 to 7.0.100-alpha.1.21622.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 aa1110922..588f52a4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - 715c2543709ca4426b26f35f0dcb54d75fb9895f + 3b3ada62fbe75517bdbd5da14c6ba65dec35d99f - + https://github.com/dotnet/templating - 715c2543709ca4426b26f35f0dcb54d75fb9895f + 3b3ada62fbe75517bdbd5da14c6ba65dec35d99f - + https://github.com/dotnet/sdk - cb394a0d9869be323ab7fad0a48ac9ee31a4dc47 + da88058b5010492e6eaf24d305fd34104e0b5b1b - + https://github.com/dotnet/sdk - cb394a0d9869be323ab7fad0a48ac9ee31a4dc47 + da88058b5010492e6eaf24d305fd34104e0b5b1b diff --git a/eng/Versions.props b/eng/Versions.props index 8077a55e0..5d66e2be3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21621.1 + 7.0.100-alpha.1.21622.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21622.2 - 7.0.100-alpha.1.21622.2 + 7.0.100-alpha.1.21622.3 + 7.0.100-alpha.1.21622.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fa3735be99d89465cd2420d5c38e5dbe741dd682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 23:17:03 +0000 Subject: [PATCH 211/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.4 (#12883) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21622.1 to 7.0.100-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21622.1 to 7.0.100-alpha.1.21622.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 588f52a4f..3dc37af77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - 3b3ada62fbe75517bdbd5da14c6ba65dec35d99f + fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/templating - 3b3ada62fbe75517bdbd5da14c6ba65dec35d99f + fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/sdk - da88058b5010492e6eaf24d305fd34104e0b5b1b + 2a93ab49d543b54f3e49a18e82a26421a7e650c4 - + https://github.com/dotnet/sdk - da88058b5010492e6eaf24d305fd34104e0b5b1b + 2a93ab49d543b54f3e49a18e82a26421a7e650c4 diff --git a/eng/Versions.props b/eng/Versions.props index 5d66e2be3..8bffdc444 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21622.1 + 7.0.100-alpha.1.21622.2 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21622.3 - 7.0.100-alpha.1.21622.3 + 7.0.100-alpha.1.21622.4 + 7.0.100-alpha.1.21622.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49f1c97afc9ab89832bd6ff4132fba8497463f79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 00:23:08 +0000 Subject: [PATCH 212/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.5 (#12884) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21621.1 to 7.0.0-alpha.1.21622.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dc37af77..7e83dde24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b - + https://github.com/dotnet/aspnetcore - 0d91a50aba7fe754b6c1044c276f0c72e4e06719 + 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/sdk - 2a93ab49d543b54f3e49a18e82a26421a7e650c4 + dee36977f7aa69b0f768641eba1956421ef8474e - + https://github.com/dotnet/sdk - 2a93ab49d543b54f3e49a18e82a26421a7e650c4 + dee36977f7aa69b0f768641eba1956421ef8474e diff --git a/eng/Versions.props b/eng/Versions.props index 8bffdc444..e05baf806 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21621.1 - 7.0.0-alpha.1.21621.1 - 7.0.0-alpha.1.21621.1 - 7.0.0-alpha.1.21621.1 - 7.0.0-alpha.1.21621.1 - 7.0.0-alpha.1.21621.1 + 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.2 0.2.0 - 7.0.100-alpha.1.21622.4 - 7.0.100-alpha.1.21622.4 + 7.0.100-alpha.1.21622.5 + 7.0.100-alpha.1.21622.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af62c20dfb360e3e15cec5312a1d3459bbda8661 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 08:25:19 +0000 Subject: [PATCH 213/239] Update dependencies from https://github.com/dotnet/sdk build 20211222.6 (#12885) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21622.2 to 7.0.0-alpha.1.21622.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e83dde24..e6a672e81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 - + https://github.com/dotnet/aspnetcore - 7203d56273519a7eb0adb31c7cdebd2a92bd9e0b + db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/sdk - dee36977f7aa69b0f768641eba1956421ef8474e + 76780b290aabc15957b6228cc3c6a79a0e14d3cf - + https://github.com/dotnet/sdk - dee36977f7aa69b0f768641eba1956421ef8474e + 76780b290aabc15957b6228cc3c6a79a0e14d3cf diff --git a/eng/Versions.props b/eng/Versions.props index e05baf806..8ec8ea45a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21622.2 - 7.0.0-alpha.1.21622.2 - 7.0.0-alpha.1.21622.2 - 7.0.0-alpha.1.21622.2 - 7.0.0-alpha.1.21622.2 - 7.0.0-alpha.1.21622.2 + 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.3 0.2.0 - 7.0.100-alpha.1.21622.5 - 7.0.100-alpha.1.21622.5 + 7.0.100-alpha.1.21622.6 + 7.0.100-alpha.1.21622.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55882483d12225c88acd2e2bb25e8db6dc57830a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 12:18:19 +0000 Subject: [PATCH 214/239] Update dependencies from https://github.com/dotnet/sdk build 20211223.1 (#12886) [main] Update dependencies from dotnet/sdk --- 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 e6a672e81..4329dc36f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/sdk - 76780b290aabc15957b6228cc3c6a79a0e14d3cf + 17831fb3af93c7837a7ddc39b7e0a4cde3248a1c - + https://github.com/dotnet/sdk - 76780b290aabc15957b6228cc3c6a79a0e14d3cf + 17831fb3af93c7837a7ddc39b7e0a4cde3248a1c diff --git a/eng/Versions.props b/eng/Versions.props index 8ec8ea45a..d30462892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21622.6 - 7.0.100-alpha.1.21622.6 + 7.0.100-alpha.1.21623.1 + 7.0.100-alpha.1.21623.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7eee5fe84b805a0eb5622ef64fe04e76bbb6ee9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 13:31:31 +0000 Subject: [PATCH 215/239] Update dependencies from https://github.com/dotnet/sdk build 20211223.2 (#12887) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211214-03 to 17.2.0-preview-20211223-01 (parent: Microsoft.NET.Sdk) --- 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 4329dc36f..b0bcabcbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ fcf34f79f24dee5e13afd749fe19c33287fd1e83 - + https://github.com/dotnet/sdk - 17831fb3af93c7837a7ddc39b7e0a4cde3248a1c + e343e286ba03225e488d2399a192a6ff4ff62a38 - + https://github.com/dotnet/sdk - 17831fb3af93c7837a7ddc39b7e0a4cde3248a1c + e343e286ba03225e488d2399a192a6ff4ff62a38 @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 0a43b14b616e57e94a34040ca3d2a211bfbe4c5a + ac24f353fb9e9a7339afd7524acd56e8a9195771 diff --git a/eng/Versions.props b/eng/Versions.props index d30462892..369cfc282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21623.1 - 7.0.100-alpha.1.21623.1 + 7.0.100-alpha.1.21623.2 + 7.0.100-alpha.1.21623.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211214-03 + 17.2.0-preview-20211223-01 From 73cba9abed7977d8a6d488f808e5eff94e2ee153 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 14:24:55 +0000 Subject: [PATCH 216/239] Update dependencies from https://github.com/dotnet/arcade build 20211223.1 (#12889) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-21617-01 to 1.2.0-beta-21620-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21618.1 to 1.0.0-beta.21621.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0bcabcbe..87e2a2b31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,33 +172,33 @@ - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 https://github.com/dotnet/source-build-reference-packages 5a659cd9117a398098779cfd75bdd86c1214c669 - + https://github.com/dotnet/sourcelink - fd61d7b341e28abd71cf73083b83dc95eb5694cb + 392126dabae557bf0664f599b5469ccc6d1dfcd8 - + https://github.com/dotnet/xliff-tasks - 6a28b6d9a37488168d2063a1d55ac5c89f053c1b + 24deafb2c24a96bf2ab5b2eb6c9306532bfcf31a diff --git a/eng/Versions.props b/eng/Versions.props index 369cfc282..ae55319de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21621.3 + 7.0.0-beta.21623.1 diff --git a/global.json b/global.json index d93ff28b8..58521f7b9 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.21621.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21621.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21623.1" } } From 2e598445c1386b3e69d0e40ef755f44808c4649b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 16:00:33 +0000 Subject: [PATCH 217/239] Update dependencies from https://github.com/dotnet/sdk build 20211223.5 (#12890) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21622.2 to 7.0.100-alpha.1.21623.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21622.2 to 7.0.100-alpha.1.21623.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 87e2a2b31..acd9e6e2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - fcf34f79f24dee5e13afd749fe19c33287fd1e83 + 2ee26381335f845166e94cd7bd95f93ca946ab9c - + https://github.com/dotnet/templating - fcf34f79f24dee5e13afd749fe19c33287fd1e83 + 2ee26381335f845166e94cd7bd95f93ca946ab9c - + https://github.com/dotnet/sdk - e343e286ba03225e488d2399a192a6ff4ff62a38 + c79da68ffc17256931ecbba05487beadc851d2d3 - + https://github.com/dotnet/sdk - e343e286ba03225e488d2399a192a6ff4ff62a38 + c79da68ffc17256931ecbba05487beadc851d2d3 diff --git a/eng/Versions.props b/eng/Versions.props index ae55319de..02ec547fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21622.2 + 7.0.100-alpha.1.21623.3 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21623.2 - 7.0.100-alpha.1.21623.2 + 7.0.100-alpha.1.21623.5 + 7.0.100-alpha.1.21623.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0645ce2b9726516a05a45f8af41beb9bc066d8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 17:06:30 +0000 Subject: [PATCH 218/239] Update dependencies from https://github.com/dotnet/sdk build 20211223.7 (#12893) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21621.6 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21621.6 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21621.6 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21622.3 to 7.0.0-alpha.1.21622.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21621.6 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21621.5 to 7.0.0-alpha.1.21622.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21621.6 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21621.5 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211223-01 to 17.2.0-preview-20211223-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acd9e6e2b..49608b52c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - e74d4009f23eded92e12fc74ab6eb135b867b108 + c37149178746320398011bb15ab277cc03572d43 - + https://github.com/dotnet/windowsdesktop - e74d4009f23eded92e12fc74ab6eb135b867b108 + c37149178746320398011bb15ab277cc03572d43 - + https://github.com/dotnet/windowsdesktop - e74d4009f23eded92e12fc74ab6eb135b867b108 + c37149178746320398011bb15ab277cc03572d43 - + https://github.com/dotnet/windowsdesktop - e74d4009f23eded92e12fc74ab6eb135b867b108 + c37149178746320398011bb15ab277cc03572d43 https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 - + https://github.com/dotnet/aspnetcore - db03aaa88ea1b2be162dc5b8cd78275d4a9b3cc4 + c65dac77cf6540c81860a42fff41eb11b9804367 https://github.com/dotnet/test-templates @@ -99,23 +99,23 @@ 2ee26381335f845166e94cd7bd95f93ca946ab9c - + https://github.com/dotnet/sdk - c79da68ffc17256931ecbba05487beadc851d2d3 + 770cf91822ca56d10f0a3b9e28874d430cfec028 - + https://github.com/dotnet/sdk - c79da68ffc17256931ecbba05487beadc851d2d3 + 770cf91822ca56d10f0a3b9e28874d430cfec028 - + https://github.com/dotnet/winforms - b2f12fddc038c8e04717f895a63aae72778b0a28 + a8da3b57279985a7f1dbc471e17f2f48c236552e - + https://github.com/dotnet/wpf - ea4cd5a567b545fadd8ed1e357e8cd78ff710a6f + 2b49347a06aa7886120452d656e862605e58ff49 https://github.com/dotnet/fsharp @@ -126,9 +126,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - ac24f353fb9e9a7339afd7524acd56e8a9195771 + aead1740e3b06a784f3da53ff1525badedef0c78 diff --git a/eng/Versions.props b/eng/Versions.props index 02ec547fa..135d2c958 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-alpha.1.21621.5 + 7.0.0-alpha.1.21622.8 - 7.0.0-alpha.1.21621.5 + 7.0.0-alpha.1.21623.1 @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21622.3 - 7.0.0-alpha.1.21622.3 - 7.0.0-alpha.1.21622.3 - 7.0.0-alpha.1.21622.3 - 7.0.0-alpha.1.21622.3 - 7.0.0-alpha.1.21622.3 + 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21622.4 0.2.0 - 7.0.100-alpha.1.21623.5 - 7.0.100-alpha.1.21623.5 + 7.0.100-alpha.1.21623.7 + 7.0.100-alpha.1.21623.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -85,10 +85,10 @@ - 7.0.0-alpha.1.21621.6 - 7.0.0-alpha.1.21621.6 - 7.0.0-alpha.1.21621.6 - 7.0.0-alpha.1.21621.6 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211223-01 + 17.2.0-preview-20211223-02 From 4056cb6451b3da4ee9c1b65920ef997ab08189f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 21:30:35 +0000 Subject: [PATCH 219/239] Update dependencies from https://github.com/dotnet/sdk build 20211223.8 (#12894) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21623.3 to 7.0.100-alpha.1.21623.7 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21623.3 to 7.0.100-alpha.1.21623.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 49608b52c..0d75dc676 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - 2ee26381335f845166e94cd7bd95f93ca946ab9c + 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/templating - 2ee26381335f845166e94cd7bd95f93ca946ab9c + 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - 770cf91822ca56d10f0a3b9e28874d430cfec028 + fb6460170a0beaeff5178ddc8f1475a30ad6a163 - + https://github.com/dotnet/sdk - 770cf91822ca56d10f0a3b9e28874d430cfec028 + fb6460170a0beaeff5178ddc8f1475a30ad6a163 diff --git a/eng/Versions.props b/eng/Versions.props index 135d2c958..65279979e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21623.3 + 7.0.100-alpha.1.21623.7 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21623.7 - 7.0.100-alpha.1.21623.7 + 7.0.100-alpha.1.21623.8 + 7.0.100-alpha.1.21623.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee92a7e8d7dbd8d1148a6ce0a918af420d8f2c56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 05:14:36 +0000 Subject: [PATCH 220/239] [main] Update dependencies from dotnet/sdk (#12895) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21622.4 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21621.3 to 7.0.0-alpha.1.21623.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d75dc676..b78ecf9da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop c37149178746320398011bb15ab277cc03572d43 - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9a50493f9f1125fda5e2212b9d6718bc7cdbc5c0 + 07af5b38b38b3dd06df7bd09119a322c6ed67c6f - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 - + https://github.com/dotnet/aspnetcore - c65dac77cf6540c81860a42fff41eb11b9804367 + 94ffe0356177368d73f98021da53456fc658fcd4 https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - fb6460170a0beaeff5178ddc8f1475a30ad6a163 + 01a2844e49a4167154f1b6461b0c14a45f42e05d - + https://github.com/dotnet/sdk - fb6460170a0beaeff5178ddc8f1475a30ad6a163 + 01a2844e49a4167154f1b6461b0c14a45f42e05d diff --git a/eng/Versions.props b/eng/Versions.props index 65279979e..d331a3b78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,36 +51,36 @@ - 7.0.0-alpha.1.21622.4 - 7.0.0-alpha.1.21622.4 - 7.0.0-alpha.1.21622.4 - 7.0.0-alpha.1.21622.4 - 7.0.0-alpha.1.21622.4 - 7.0.0-alpha.1.21622.4 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 0.2.0 - 7.0.100-alpha.1.21623.8 - 7.0.100-alpha.1.21623.8 + 7.0.100-alpha.1.21623.10 + 7.0.100-alpha.1.21623.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21621.3 - 7.0.0-alpha.1.21621.3 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.1 2.1.0 From dd3a7694144e7f481f70a8adfef7005fac623993 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 14:09:22 +0000 Subject: [PATCH 221/239] Update dependencies from https://github.com/dotnet/arcade build 20211223.2 (#12896) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/cross/arm/tizen-build-rootfs.sh | 35 +++++ eng/common/cross/arm/tizen-fetch.sh | 170 +++++++++++++++++++++ eng/common/cross/arm/tizen/tizen.patch | 9 ++ eng/common/cross/build-rootfs.sh | 4 +- eng/common/cross/toolchain.cmake | 11 +- global.json | 4 +- 8 files changed, 234 insertions(+), 13 deletions(-) create mode 100644 eng/common/cross/arm/tizen-build-rootfs.sh create mode 100644 eng/common/cross/arm/tizen-fetch.sh create mode 100644 eng/common/cross/arm/tizen/tizen.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b78ecf9da..f9e18226b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 + 1a66526b0c1eb068cab89909b7d52fe6f57d64df - + https://github.com/dotnet/arcade - 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 + 1a66526b0c1eb068cab89909b7d52fe6f57d64df - + https://github.com/dotnet/arcade - 4abaab2bf44d06638abeb23fc96c4f6eef58a2f0 + 1a66526b0c1eb068cab89909b7d52fe6f57d64df https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d331a3b78..35933cdb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21623.1 + 7.0.0-beta.21623.2 diff --git a/eng/common/cross/arm/tizen-build-rootfs.sh b/eng/common/cross/arm/tizen-build-rootfs.sh new file mode 100644 index 000000000..9fdb32e92 --- /dev/null +++ b/eng/common/cross/arm/tizen-build-rootfs.sh @@ -0,0 +1,35 @@ +#!/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 +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 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 unified +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release + diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch new file mode 100644 index 000000000..fb12ade72 --- /dev/null +++ b/eng/common/cross/arm/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5102245b7..e94d13d62 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -185,8 +185,8 @@ while :; do __LLDB_Package="liblldb-6.0-dev" ;; tizen) - if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then - echo "Tizen is available only for armel and arm64." + if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then + echo "Tizen is available only for arm, armel and arm64." usage; exit 1; fi diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 6501c3a95..8369ae0b4 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -26,6 +26,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() + if("$ENV{__DistroRid}" MATCHES "tizen.*") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) @@ -58,6 +61,10 @@ endif() # Specify include paths if(DEFINED TIZEN_TOOLCHAIN) + if(TARGET_ARCH_NAME STREQUAL "arm") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) + endif() if(TARGET_ARCH_NAME STREQUAL "armel") include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) @@ -150,7 +157,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}") endif() -if(TARGET_ARCH_NAME STREQUAL "armel") +if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel") if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") @@ -205,7 +212,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() if(DEFINED TIZEN_TOOLCHAIN) - if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$") + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") add_compile_options(-Wno-deprecated-declarations) # compile-time option add_compile_options(-D__extern_always_inline=inline) # compile-time option endif() diff --git a/global.json b/global.json index 58521f7b9..59de7320d 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.21623.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21623.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21623.2" } } From a9f0060ca02877b4effaac025418513d2d715377 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 19:40:55 +0000 Subject: [PATCH 222/239] Update dependencies from https://github.com/dotnet/sdk build 20211224.2 (#12898) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21623.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9e18226b..3656922fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - c37149178746320398011bb15ab277cc03572d43 + 851c3773196fcc8ae79c71ee7511ecc946e986c0 - + https://github.com/dotnet/windowsdesktop - c37149178746320398011bb15ab277cc03572d43 + 851c3773196fcc8ae79c71ee7511ecc946e986c0 - + https://github.com/dotnet/windowsdesktop - c37149178746320398011bb15ab277cc03572d43 + 851c3773196fcc8ae79c71ee7511ecc946e986c0 - + https://github.com/dotnet/windowsdesktop - c37149178746320398011bb15ab277cc03572d43 + 851c3773196fcc8ae79c71ee7511ecc946e986c0 - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 07af5b38b38b3dd06df7bd09119a322c6ed67c6f + 1d1226730223ccf5438e3524de60da4b9a92bc0d https://github.com/dotnet/aspnetcore @@ -99,23 +99,23 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - 01a2844e49a4167154f1b6461b0c14a45f42e05d + 6dd8d093a681dfe0970d94e3a672495e46469263 - + https://github.com/dotnet/sdk - 01a2844e49a4167154f1b6461b0c14a45f42e05d + 6dd8d093a681dfe0970d94e3a672495e46469263 https://github.com/dotnet/winforms a8da3b57279985a7f1dbc471e17f2f48c236552e - + https://github.com/dotnet/wpf - 2b49347a06aa7886120452d656e862605e58ff49 + e83db97a2fb11a0951e9b6257e38b71aaa60e390 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 35933cdb4..d6f60b4aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.3 @@ -63,32 +63,32 @@ - 7.0.100-alpha.1.21623.10 - 7.0.100-alpha.1.21623.10 + 7.0.100-alpha.1.21624.2 + 7.0.100-alpha.1.21624.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21623.6 2.1.0 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21623.4 + 7.0.0-alpha.1.21623.4 + 7.0.0-alpha.1.21623.4 + 7.0.0-alpha.1.21623.4 From 027159e63939e6be2e69b77a56a405750adb8763 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 16:22:19 +0000 Subject: [PATCH 223/239] Update dependencies from https://github.com/dotnet/sdk build 20211225.1 (#12899) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21623.4 to 7.0.0-alpha.1.21624.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21623.4 to 7.0.0-alpha.1.21624.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21623.4 to 7.0.0-alpha.1.21624.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.4 to 7.0.0-alpha.1.21624.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.4 to 7.0.0-alpha.1.21624.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21623.3 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3656922fc..7eb80f441 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 851c3773196fcc8ae79c71ee7511ecc946e986c0 + 012afcd90beecba6839223d661542ee86c4567df - + https://github.com/dotnet/windowsdesktop - 851c3773196fcc8ae79c71ee7511ecc946e986c0 + 012afcd90beecba6839223d661542ee86c4567df - + https://github.com/dotnet/windowsdesktop - 851c3773196fcc8ae79c71ee7511ecc946e986c0 + 012afcd90beecba6839223d661542ee86c4567df - + https://github.com/dotnet/windowsdesktop - 851c3773196fcc8ae79c71ee7511ecc946e986c0 + 012afcd90beecba6839223d661542ee86c4567df https://github.com/dotnet/runtime @@ -99,23 +99,23 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - 6dd8d093a681dfe0970d94e3a672495e46469263 + e5010e9d71b3ec381c1cab1a3607b89242ec7b04 - + https://github.com/dotnet/sdk - 6dd8d093a681dfe0970d94e3a672495e46469263 + e5010e9d71b3ec381c1cab1a3607b89242ec7b04 https://github.com/dotnet/winforms a8da3b57279985a7f1dbc471e17f2f48c236552e - + https://github.com/dotnet/wpf - e83db97a2fb11a0951e9b6257e38b71aaa60e390 + 964b7ef46fce1d635abb441556cff0f29ef5b7de https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d6f60b4aa..64d716b2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 7.0.0-alpha.1.21623.3 + 7.0.0-alpha.1.21624.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21624.2 - 7.0.100-alpha.1.21624.2 + 7.0.100-alpha.1.21625.1 + 7.0.100-alpha.1.21625.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -85,10 +85,10 @@ - 7.0.0-alpha.1.21623.4 - 7.0.0-alpha.1.21623.4 - 7.0.0-alpha.1.21623.4 - 7.0.0-alpha.1.21623.4 + 7.0.0-alpha.1.21624.2 + 7.0.0-alpha.1.21624.2 + 7.0.0-alpha.1.21624.2 + 7.0.0-alpha.1.21624.2 From 89599ab76346b126afb1e04599a3d7c3f210b155 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 17:22:32 +0000 Subject: [PATCH 224/239] Update dependencies from https://github.com/dotnet/sdk build 20211225.2 (#12900) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21623.6 to 7.0.0-alpha.1.21624.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eb80f441..7c911d1e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 012afcd90beecba6839223d661542ee86c4567df - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1d1226730223ccf5438e3524de60da4b9a92bc0d + 84680bf557210114ea5ca823386cd49691c4cac6 https://github.com/dotnet/aspnetcore @@ -99,14 +99,14 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - e5010e9d71b3ec381c1cab1a3607b89242ec7b04 + 6a320eac60a7ae6d535af16efdd8e7a404a299fc - + https://github.com/dotnet/sdk - e5010e9d71b3ec381c1cab1a3607b89242ec7b04 + 6a320eac60a7ae6d535af16efdd8e7a404a299fc diff --git a/eng/Versions.props b/eng/Versions.props index 64d716b2f..38957c5d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,24 +63,24 @@ - 7.0.100-alpha.1.21625.1 - 7.0.100-alpha.1.21625.1 + 7.0.100-alpha.1.21625.2 + 7.0.100-alpha.1.21625.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.6 - 7.0.0-alpha.1.21623.6 + 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21624.1 2.1.0 From 2774ff1e17788f441e1bbbb0eab982b6adf38e1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 20:22:57 +0000 Subject: [PATCH 225/239] Update dependencies from https://github.com/dotnet/sdk build 20211225.3 (#12901) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21623.1 to 7.0.0-alpha.1.21625.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c911d1e3..42432d77a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae - + https://github.com/dotnet/aspnetcore - 94ffe0356177368d73f98021da53456fc658fcd4 + 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - 6a320eac60a7ae6d535af16efdd8e7a404a299fc + e47af9e3bdef9e5933c73e842835f3097a9c8e15 - + https://github.com/dotnet/sdk - 6a320eac60a7ae6d535af16efdd8e7a404a299fc + e47af9e3bdef9e5933c73e842835f3097a9c8e15 diff --git a/eng/Versions.props b/eng/Versions.props index 38957c5d1..ff5218ff6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 - 7.0.0-alpha.1.21623.1 + 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21625.1 0.2.0 - 7.0.100-alpha.1.21625.2 - 7.0.100-alpha.1.21625.2 + 7.0.100-alpha.1.21625.3 + 7.0.100-alpha.1.21625.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44bf00ccecf7eae3bc8cf325a8a4b208e32efddd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Dec 2021 03:56:20 +0000 Subject: [PATCH 226/239] Update dependencies from https://github.com/dotnet/sdk build 20211226.1 (#12902) [main] Update dependencies from dotnet/sdk --- 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 42432d77a..91684813b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,14 +99,14 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - e47af9e3bdef9e5933c73e842835f3097a9c8e15 + d0f9531d43cb6ea29a6d06a344578da03fe163a6 - + https://github.com/dotnet/sdk - e47af9e3bdef9e5933c73e842835f3097a9c8e15 + d0f9531d43cb6ea29a6d06a344578da03fe163a6 diff --git a/eng/Versions.props b/eng/Versions.props index ff5218ff6..2ea99b1ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21625.3 - 7.0.100-alpha.1.21625.3 + 7.0.100-alpha.1.21626.1 + 7.0.100-alpha.1.21626.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2c4c0de476e10ef0d9b68a3d4065b4382d4aa0f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 05:15:46 +0000 Subject: [PATCH 227/239] [main] Update dependencies from dotnet/sdk (#12903) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21625.1 to 7.0.0-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21620.1 to 7.0.100-1.21627.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91684813b..d9d0de4db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 84680bf557210114ea5ca823386cd49691c4cac6 - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b - + https://github.com/dotnet/aspnetcore - 4daeb0aaaa3150a7ce8350c4a2f5c452794964ae + 462e46e4f25a7eb2656b0bc9380b1691eb0a8d0b https://github.com/dotnet/test-templates @@ -99,14 +99,14 @@ 29811f3d3a79541fa25b9f941d24ba568f37b781 - + https://github.com/dotnet/sdk - d0f9531d43cb6ea29a6d06a344578da03fe163a6 + 44c9bd669ece1542525d65acbf6309f7432a05f4 - + https://github.com/dotnet/sdk - d0f9531d43cb6ea29a6d06a344578da03fe163a6 + 44c9bd669ece1542525d65acbf6309f7432a05f4 @@ -131,9 +131,9 @@ aead1740e3b06a784f3da53ff1525badedef0c78 - + https://github.com/dotnet/linker - 41467d340a3345f08cb8ba67c20c1ea40c57682f + 9996319f2a619c2911b02c164b4d6b1d20e29a39 linker diff --git a/eng/Versions.props b/eng/Versions.props index 2ea99b1ae..79fc9f465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,20 +51,20 @@ - 7.0.0-alpha.1.21625.1 - 7.0.0-alpha.1.21625.1 - 7.0.0-alpha.1.21625.1 - 7.0.0-alpha.1.21625.1 - 7.0.0-alpha.1.21625.1 - 7.0.0-alpha.1.21625.1 + 7.0.0-alpha.1.21627.1 + 7.0.0-alpha.1.21627.1 + 7.0.0-alpha.1.21627.1 + 7.0.0-alpha.1.21627.1 + 7.0.0-alpha.1.21627.1 + 7.0.0-alpha.1.21627.1 0.2.0 - 7.0.100-alpha.1.21626.1 - 7.0.100-alpha.1.21626.1 + 7.0.100-alpha.1.21627.2 + 7.0.100-alpha.1.21627.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 86cf97f91c3d09c7f55e5da0b322070ed4227d4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 06:38:37 +0000 Subject: [PATCH 228/239] Update dependencies from https://github.com/dotnet/sdk build 20211227.3 (#12904) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21623.7 to 7.0.100-alpha.1.21626.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21623.7 to 7.0.100-alpha.1.21626.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 d9d0de4db..03c66ad62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - 29811f3d3a79541fa25b9f941d24ba568f37b781 + 716b5d8aca40cd97d940293f2b9d19fac1819ffd - + https://github.com/dotnet/templating - 29811f3d3a79541fa25b9f941d24ba568f37b781 + 716b5d8aca40cd97d940293f2b9d19fac1819ffd - + https://github.com/dotnet/sdk - 44c9bd669ece1542525d65acbf6309f7432a05f4 + e1b590641914157acf12d356dde45c88013c11f9 - + https://github.com/dotnet/sdk - 44c9bd669ece1542525d65acbf6309f7432a05f4 + e1b590641914157acf12d356dde45c88013c11f9 diff --git a/eng/Versions.props b/eng/Versions.props index 79fc9f465..dbc18e925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21623.7 + 7.0.100-alpha.1.21626.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21627.2 - 7.0.100-alpha.1.21627.2 + 7.0.100-alpha.1.21627.3 + 7.0.100-alpha.1.21627.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 34e5d5c37739d810c909c053fa6840b49572a6fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 08:47:38 +0000 Subject: [PATCH 229/239] Update dependencies from https://github.com/dotnet/sdk build 20211227.4 (#12905) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21624.1 to 7.0.0-alpha.1.21626.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03c66ad62..3d0af1f4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 012afcd90beecba6839223d661542ee86c4567df - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 84680bf557210114ea5ca823386cd49691c4cac6 + 46f5b99dd184af5dacb198399d4c13620dd44c53 https://github.com/dotnet/aspnetcore @@ -99,14 +99,14 @@ 716b5d8aca40cd97d940293f2b9d19fac1819ffd - + https://github.com/dotnet/sdk - e1b590641914157acf12d356dde45c88013c11f9 + 68e56043ad52fc8bae3cf2f1ea368cfba1b24c8b - + https://github.com/dotnet/sdk - e1b590641914157acf12d356dde45c88013c11f9 + 68e56043ad52fc8bae3cf2f1ea368cfba1b24c8b diff --git a/eng/Versions.props b/eng/Versions.props index dbc18e925..a0872bab8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,24 +63,24 @@ - 7.0.100-alpha.1.21627.3 - 7.0.100-alpha.1.21627.3 + 7.0.100-alpha.1.21627.4 + 7.0.100-alpha.1.21627.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21626.3 - 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21624.1 - 7.0.0-alpha.1.21624.1 + 7.0.0-alpha.1.21626.3 + 7.0.0-alpha.1.21626.3 + 7.0.0-alpha.1.21626.3 + 7.0.0-alpha.1.21626.3 + 7.0.0-alpha.1.21626.3 + 7.0.0-alpha.1.21626.3 2.1.0 From 7f8edf63a41753054c00bf458ace2eb3540750f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 13:18:17 +0000 Subject: [PATCH 230/239] Update dependencies from https://github.com/dotnet/sdk build 20211228.1 (#12907) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21626.1 to 7.0.100-alpha.1.21627.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21626.1 to 7.0.100-alpha.1.21627.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 3d0af1f4f..9955a6042 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,23 +90,23 @@ aef25c8e45e2ab42294cef1b37e3657c118d74b7 - + https://github.com/dotnet/templating - 716b5d8aca40cd97d940293f2b9d19fac1819ffd + 6d8a942c075e809423b900d0e6f1c1caf9cc659b - + https://github.com/dotnet/templating - 716b5d8aca40cd97d940293f2b9d19fac1819ffd + 6d8a942c075e809423b900d0e6f1c1caf9cc659b - + https://github.com/dotnet/sdk - 68e56043ad52fc8bae3cf2f1ea368cfba1b24c8b + 826246b7f6b34d669bfc1a97f889552cda874a48 - + https://github.com/dotnet/sdk - 68e56043ad52fc8bae3cf2f1ea368cfba1b24c8b + 826246b7f6b34d669bfc1a97f889552cda874a48 diff --git a/eng/Versions.props b/eng/Versions.props index a0872bab8..1d0491721 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-alpha.1.21626.1 + 7.0.100-alpha.1.21627.1 @@ -63,8 +63,8 @@ - 7.0.100-alpha.1.21627.4 - 7.0.100-alpha.1.21627.4 + 7.0.100-alpha.1.21628.1 + 7.0.100-alpha.1.21628.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 416a6e8833eeb42771450bebab3277e27accbc1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 14:23:49 +0000 Subject: [PATCH 231/239] Update dependencies from https://github.com/dotnet/arcade build 20211227.1 (#12908) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21621.1 to 1.0.0-beta.21624.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 ++++++------- eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 38 +++++++++++++++++++----------- eng/common/native/init-compiler.sh | 32 ++++++++++++++++++++----- global.json | 4 ++-- 5 files changed, 61 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9955a6042..b9ba09f4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 1a66526b0c1eb068cab89909b7d52fe6f57d64df + 28ea474e02753fe23295f60e8792bc845b8b6e20 - + https://github.com/dotnet/arcade - 1a66526b0c1eb068cab89909b7d52fe6f57d64df + 28ea474e02753fe23295f60e8792bc845b8b6e20 - + https://github.com/dotnet/arcade - 1a66526b0c1eb068cab89909b7d52fe6f57d64df + 28ea474e02753fe23295f60e8792bc845b8b6e20 https://github.com/dotnet/source-build-reference-packages @@ -196,9 +196,9 @@ 392126dabae557bf0664f599b5469ccc6d1dfcd8 - + https://github.com/dotnet/xliff-tasks - 24deafb2c24a96bf2ab5b2eb6c9306532bfcf31a + 83b25ddf3bb32541ae885e9f3b2e8503e4488902 diff --git a/eng/Versions.props b/eng/Versions.props index 1d0491721..b45b4b713 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.21623.2 + 7.0.0-beta.21627.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 8369ae0b4..f7878dddd 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) + set(FREEBSD 1) elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(CMAKE_SYSTEM_NAME SunOS) set(ILLUMOS 1) else() set(CMAKE_SYSTEM_NAME Linux) + set(LINUX 1) endif() set(CMAKE_SYSTEM_VERSION 1) +if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release) + set(TIZEN 1) +elseif(EXISTS ${CROSS_ROOTFS}/android_platform) + set(ANDROID 1) +endif() + if(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") - if("$ENV{__DistroRid}" MATCHES "tizen.*") + if(TIZEN) set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") @@ -26,7 +34,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() - if("$ENV{__DistroRid}" MATCHES "tizen.*") + if(TIZEN) set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") @@ -36,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") else() set(TOOLCHAIN "aarch64-linux-gnu") endif() - if("$ENV{__DistroRid}" MATCHES "tizen.*") + if(TIZEN) set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -45,7 +53,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x") elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) set(TOOLCHAIN "i686-linux-gnu") -elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +elseif (FREEBSD) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(triple "x86_64-unknown-freebsd12") elseif (ILLUMOS) @@ -60,7 +68,7 @@ if(DEFINED ENV{TOOLCHAIN}) endif() # Specify include paths -if(DEFINED TIZEN_TOOLCHAIN) +if(TIZEN) if(TARGET_ARCH_NAME STREQUAL "arm") include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) @@ -75,7 +83,7 @@ if(DEFINED TIZEN_TOOLCHAIN) endif() endif() -if("$ENV{__DistroRid}" MATCHES "android.*") +if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) elseif(TARGET_ARCH_NAME STREQUAL "arm64") @@ -83,7 +91,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*") endif() # extract platform number required by the NDK's toolchain - string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}") + file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS) + string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}") + string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}") set(ANDROID_TOOLCHAIN clang) set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository @@ -92,7 +102,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*") # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) -elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +elseif(FREEBSD) # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) @@ -152,20 +162,20 @@ function(add_toolchain_linker_flag Flag) set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE) endfunction() -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(LINUX) add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}") endif() -if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel") - if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only +if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") + if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") 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") - if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only + if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") @@ -184,7 +194,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) @@ -211,7 +221,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") add_compile_options(-Wno-error=unused-command-line-argument) endif() -if(DEFINED TIZEN_TOOLCHAIN) +if(TIZEN) if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") add_compile_options(-Wno-deprecated-declarations) # compile-time option add_compile_options(-D__extern_always_inline=inline) # compile-time option diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index e361e03fa..6d7ba15e5 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,25 +2,45 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." - echo "init-compiler.sh