From 168cfd8f98a79408aa7e113aeb64f2eb3e432fb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 27 Oct 2021 16:39:26 -0700 Subject: [PATCH 01/25] 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 082265dd3a159a8c098a0486a7822d91bacf7d2c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 2 Nov 2021 23:39:27 -0700 Subject: [PATCH 02/25] 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 61774f69e89e2171718fcc7b5abfa3e6dc8bbd67 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 09:08:58 -0700 Subject: [PATCH 03/25] 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 04/25] 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 05/25] 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 590cbca7eae32f5aa1a74d82300e498ab1092e59 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 3 Nov 2021 10:35:42 -0700 Subject: [PATCH 06/25] 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 23:14:42 -0700 Subject: [PATCH 07/25] 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 86cb0ed124bfd93e23dad68685a3654b4ec97685 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 11:11:00 -0700 Subject: [PATCH 08/25] 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 9056116cb32133d97101a5cc8fcf7483dadc91ac Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 12 Nov 2021 09:31:38 -0600 Subject: [PATCH 09/25] 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 10/25] 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 11/25] 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 12/25] 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 fb42fb7282657762abeed5d661d8094af359a1d5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Nov 2021 13:47:22 -0800 Subject: [PATCH 13/25] 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 @@ - - + + - $(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)')) - + + + + + + + + + @(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 b412c618011a72bf68efa54d9da2a7692f97e7fe Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 16 Nov 2021 19:48:47 -0600 Subject: [PATCH 20/25] 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 836def04239a36aaaf89bdc5aae5d88e6055719f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 Nov 2021 16:07:20 -0600 Subject: [PATCH 21/25] 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 22/25] 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 5466891cbb34afd86650140bb0421357bd29622c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 Nov 2021 22:12:40 -0600 Subject: [PATCH 23/25] 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 6d87160a67cbc6af43e2960e63cc9e3261c52d06 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 18 Nov 2021 13:57:14 -0600 Subject: [PATCH 24/25] 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 f8e115fadf6e8b392fa007e78d9b77fc64590cdd Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 29 Nov 2021 20:19:30 -0800 Subject: [PATCH 25/25] 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