From fffc681edd6933371032f8891b0885667783e3d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Apr 2023 12:02:20 -0700 Subject: [PATCH 01/13] Initial attempt to automate the minimum VS version --- src/redist/targets/GenerateMSIs.targets | 11 +++++++++++ .../packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1033/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/bundle.wxs | 1 + .../packaging/windows/clisdk/generatebundle.ps1 | 1 + 17 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 3a0fd7fef..714b47a5a 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -309,6 +309,17 @@ Overwrite="true" /> + + + + %(SDKInternalFiles.Identity) + $([System.IO.File]::ReadAllText($(FileToRead)).Trim()) + + + 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET [VERSIONMAJOR].[VERSIONMINOR]，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET [VERSIONMAJOR].[VERSIONMINOR]，需要 Visual Studio 2022 [MINIMUMVSVERSION] 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>. 按一下 “安裝” 即表示您同意下列條款: x64 SDK 安裝的安裝路徑: "[DOTNETHOME_X64]" 不能與 x86 SDK 安裝的路徑相同: "[DOTNETHOME_X86]" 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 59e1e80bc..f823144e4 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 @@ Prostředky 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 plánujete používat .NET [VERSIONMAJOR].[VERSIONMINOR] s Visual Studio, vyžaduje se Visual Studio 2022 17.4 nebo novější. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Další informace</A>. + Pokud plánujete používat .NET [VERSIONMAJOR].[VERSIONMINOR] s Visual Studio, vyžaduje se Visual Studio 2022 [MINIMUMVSVERSION] nebo novější. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami: Instalační cesta pro instalace sady x64 SDK[ DOTNETHOME_X64] nemůže být stejná jako u instalací sady x86 SDK: [DOTNETHOME_X86]. 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 3377e860b..31aec6fde 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 beabsichtigen, .NET [VERSIONMAJOR].[VERSIONMINOR] mit Visual Studio zu verwenden, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A>. + Wenn Sie beabsichtigen, .NET [VERSIONMAJOR].[VERSIONMINOR] mit Visual Studio zu verwenden, ist Visual Studio 2022 [MINIMUMVSVERSION] oder höher erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A>. Durch Klicken auf „Installieren2 stimmen Sie den nachstehenden Bedingungen zu: Der Installationspfad „[DOTNETHOME_X64]“ für x64 SDK-Installationen kann nicht derselbe sein wie für x86 SDK-Installationen: „[DOTNETHOME_X86]“ 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 f73c3f7cd..840955765 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -76,7 +76,7 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - If you plan to use .NET [VERSIONMAJOR].[VERSIONMINOR] with Visual Studio, Visual Studio 2022 17.4 or newer is required. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + If you plan to use .NET [VERSIONMAJOR].[VERSIONMINOR] with Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] or newer is required. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-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]" 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 7301867fb..6243737a1 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 envisagez d’utiliser .NET [VERSIONMAJOR].[VERSIONMINOR] avec Visual Studio, Visual Studio 2022 17.4 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">En savoir plus</A>. + Si vous envisagez d’utiliser .NET [VERSIONMAJOR].[VERSIONMINOR] avec Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes : Le chemin d’installation des installations du Kit de développement logiciel (SDK) x64 : « [DOTNETHOME_X64] » ne peut pas être identique à celui des installations du Kit de développement logiciel (SDK) x86 : « [DOTNETHOME_X86] » 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 8eadd7f94..12f021796 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -76,7 +76,7 @@ Risorse Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si prevede di usare .NET [VERSIONMAJOR]. [VERSIONMINOR] con Visual Studio, è necessario Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. + Se si prevede di usare .NET [VERSIONMAJOR]. [VERSIONMINOR] con Visual Studio, è necessario Visual Studio 2022 [MINIMUMVSVERSION] o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti: Percorso di installazione per le installazioni x64 SDK: "[DOTNETHOME_X64]" non può essere uguale a quello delle installazioni di x86 SDK: "[DOTNETHOME_X86]" 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 1d08d3676..1dbf0062f 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 [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A>. + .NET [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio で使用する場合は、Visual Studio 2022 [MINIMUMVSVERSION] 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A>. インストール をクリックすると、次の条項に同意したものと見なされます: x64 SDK インストールのインストール パス: "[DOTNETHOME_X64]" を x86 SDK インストールの場合と同じにすることはできません: "[DOTNETHOME_X86]" 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 1cc3ff5b9..d02f2754b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -76,7 +76,7 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio에서 .NET [VERSIONMAJOR].[VERSIONMINOR]를 사용하려는 경우 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + Visual Studio에서 .NET [VERSIONMAJOR].[VERSIONMINOR]를 사용하려는 경우 Visual Studio 2022 [MINIMUMVSVERSION] 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. 설치를 클릭하면 다음 사용 약관에 동의하는 것입니다. x64 SDK 설치의 설치 경로: " [DOTNETHOME_x64]" x86 SDK 설치의 경우와 같을 수 없습니다. " [DOTNETHOME_X86]" 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 3a79802fd..ca721b383 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -76,7 +76,7 @@ Zasoby Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET [VERSIONMAJOR].[VERSIONMINOR] z programem Visual Studio, wymagany jest program Visual Studio 2022 17.4 lub nowszy. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET [VERSIONMAJOR].[VERSIONMINOR] z programem Visual Studio, wymagany jest program Visual Studio 2022 [MINIMUMVSVERSION] lub nowszy. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Dowiedz się więcej</A>. Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki: Ścieżka instalacji w przypadku instalacji zestawu SDK x64: „[DOTNETHOME_X64]” nie może być taka sama jak w przypadku instalacji zestawu SDK x86: „[DOTNETHOME_X86]” 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 52e844682..3b35739d4 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 [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, Visual Studio 2022 17.4 ou mais recente é necessário. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. + Se você planeja usar o .NET [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] ou mais recente é necessário. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. Ao clicar em Instalar, você concorda com os termos a seguir: O caminho da instalação para instalações do SDK x64: "[DOTNETHOME_X64]" não pode ser o mesmo que para instalações do SDK x86: "[DOTNETHOME_X86]" 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 6f2d54d3b..eaa2c86c9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -76,7 +76,7 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Дополнительные сведения</A>. + Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии [MINIMUMVSVERSION] или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. Совпадение пути установки недопустимо для установок пакетов SDK x64: "[DOTNETHOME_X64]" и SDK x86: "[DOTNETHOME_X86]". 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 03c3ff437..d38b7dbb3 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 [VERSIONMAJOR].[VERSIONMINOR] kullanmayı planlıyorsanız Visual Studio 2022 17.4 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Daha fazla bilgi edinin</A>. + Visual Studio ile .NET [VERSIONMAJOR].[VERSIONMINOR] kullanmayı planlıyorsanız Visual Studio 2022 [MINIMUMVSVERSION] veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Daha fazla bilgi edinin</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz: x64 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X64]"), x86 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X86]") ile aynı olamaz 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 ed87dfc8d..ab10aed0e 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 [VERSIONMAJOR].[VERSIONMINOR] 与 Visual Studio、Visual Studio 2022 17.4 或更高版本是必需的。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 + 如果你计划使用 .NET [VERSIONMAJOR].[VERSIONMINOR] 与 Visual Studio、Visual Studio 2022 [MINIMUMVSVERSION] 或更高版本是必需的。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款: x64 SDK 安装的安装路径: "[DOTNETHOME_X64]" 不能与 x86 SDK 安装的路径相同: "[DOTNETHOME_X86]" 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 c29d3a265..d3fe30d21 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -77,7 +77,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 utilizar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, necesitará Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + Si tiene previsto utilizar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, necesitará Visual Studio 2022 [MINIMUMVSVERSION] o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. Al hacer clic en Instalar, acepta los siguientes términos: La ruta de instalación para las instalaciones del SDK x64: "[DOTNETHOME_X64]" no puede ser la misma que para las instalaciones del SDK x86: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index ea5a58ae6..27cf3e616 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -152,6 +152,7 @@ + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 4d0f91565..84bb459fa 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -72,6 +72,7 @@ function RunCandleForBundle -dTemplatesMsiSourcePath="$TemplatesMSIFile" ` -dManifestsMsiSourcePath="$ManifestsMSIFile" ` -dWinFormsAndWpfVersion="$WindowsDesktopVersion" ` + -dMinimumVSVersion="$MinimumVSVersion" ` -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" ` From f095e7a60bba41f85916a3adbd664ca2d78210d9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Apr 2023 14:25:04 -0700 Subject: [PATCH 02/13] Fix the logic to pass in the version of VS all the way through to the candle app --- src/redist/targets/GenerateMSIs.targets | 8 ++++++-- .../targets/packaging/windows/clisdk/generatebundle.ps1 | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 714b47a5a..2c1c41352 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -315,9 +315,12 @@ Outputs="$(MinimumVSVersion)"> - %(SDKInternalFiles.Identity) - $([System.IO.File]::ReadAllText($(FileToRead)).Trim()) + %(SDKInternalFiles.Identity) + + + + Date: Fri, 28 Apr 2023 07:09:18 +0000 Subject: [PATCH 03/13] Fix BlazorWasm projects --- .../WebScenarioTests.cs | 3 +- ...xtensions.ObjectPool-package-version.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 525027683..56d0368f3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -34,8 +34,7 @@ public class WebScenarioTests : SmokeTests } yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); - // TODO: Investigate and re-enable - //yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); diff --git a/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch new file mode 100644 index 000000000..1af0b6e93 --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 28 Apr 2023 07:06:18 +0000 +Subject: [PATCH] Fix Microsoft.Extensions.ObjectPool package version + +--- + eng/Versions.props | 2 ++ + src/Compiler/Directory.Packages.props | 2 +- + ...osoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj | 2 +- + .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 559125601..6c101b515 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -94,6 +94,8 @@ + 17.5.0-preview-2-33117-317 + 17.5.274-preview + 17.6.4-preview ++ ++ 6.0.0 + + 6.0.0 + 6.0.0 +diff --git a/src/Compiler/Directory.Packages.props b/src/Compiler/Directory.Packages.props +index 118ed5d41..245b9bd4f 100644 +--- a/src/Compiler/Directory.Packages.props ++++ b/src/Compiler/Directory.Packages.props +@@ -30,6 +30,6 @@ + + + +- ++ + + +diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj +index 7a90709c3..278d12786 100644 +--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj ++++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj +@@ -11,7 +11,7 @@ + + + +- ++ + + + +diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +index 7b7fbdd73..e591d60de 100644 +--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj ++++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +@@ -11,7 +11,7 @@ + + + +- ++ + + + From e0e93a9a55b106bffaceddef298061ffb9fa7218 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 28 Apr 2023 07:33:00 -0500 Subject: [PATCH 04/13] Update prebuilts tarball version (#16271) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 80276b826..9de81cab2 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-25.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-26.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz From c730f25784ac20f2722bc8795818b21542760e80 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 28 Apr 2023 11:31:30 -0500 Subject: [PATCH 05/13] Fix vstest analyzer errors (#16269) (#16277) --- src/SourceBuild/content/repo-projects/vstest.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj index c0ce08237..00c4c842f 100644 --- a/src/SourceBuild/content/repo-projects/vstest.proj +++ b/src/SourceBuild/content/repo-projects/vstest.proj @@ -7,6 +7,10 @@ $(ProjectDirectory)\eng\common\build$(ShellExtension) $(BuildCommandArgs) true + + + + IDE0059;SYSLIB0051 From 0ce891843a4ee251d356cd429c596ba25ee15dc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:29:30 +0000 Subject: [PATCH 06/13] [main] Update dependencies from dotnet/source-build-reference-packages (#16279) [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 5b8604689..3ad004d06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 9bd919efa1924f2684e63079a9e1106a4ce52b11 + d3a063d6462cb2f29a0e82285d6c9b5bf87c1637 From 87796ec7da5cd2aeaf71e325c04cb1964c5a580f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 28 Apr 2023 10:53:55 -0700 Subject: [PATCH 07/13] Fix building RPMs (#16249) --- .vsts-ci.yml | 4 +-- src/redist/targets/GenerateLayout.targets | 1 + src/redist/targets/GenerateRPMs.targets | 42 +++++++++++------------ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b44cf897c..5c2195610 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -254,7 +254,7 @@ stages: buildArchitecture: x64 # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false' + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - template: eng/build.yml @@ -267,7 +267,7 @@ stages: runtimeIdentifier: 'linux-arm64' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - template: eng/build.yml diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index a27834f85..4abe26990 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -38,6 +38,7 @@ $(HostRid) $(OSName)-$(Architecture) + $(HostRid.Replace('mariner.2.0', 'cm.2')) -internal diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index a82f068fc..044afcc6e 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -330,18 +330,18 @@ Outputs="$(RpmTestResultsXmlFile)" > - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + From 67bfe8fce85e2707707ff60277315faa67c9250d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 28 Apr 2023 22:10:33 +0200 Subject: [PATCH 08/13] Create KnownRuntimePack entries for NativeAOT (#16261) --- .../targets/GenerateBundledVersions.targets | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 101101712..f1314ce06 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -263,6 +263,18 @@ + + @@ -403,6 +415,15 @@ Copyright (c) .NET Foundation. All rights reserved. ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')" /> + + From 2487ca15dc76c3fd54f3a0d2bbc683cae351d1d0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 1 May 2023 08:20:52 -0500 Subject: [PATCH 09/13] Update poison usage baseline (#16280) --- .../assets/baselines/PoisonUsage.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 0cd3b4111..66750df7b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,10 +1,24 @@ + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute AssemblyAttribute + + Hash, AssemblyAttribute + + + + Hash, AssemblyAttribute + + AssemblyAttribute From b1fceb6a009d400d8f204dd1bddf6a5cdad40297 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 1 May 2023 09:28:11 -0500 Subject: [PATCH 10/13] Fix IDE analyzer errors for aspnetcore (#16268) (#16276) --- src/SourceBuild/content/repo-projects/aspnetcore.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 17aef7931..13c829268 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -26,7 +26,9 @@ - CA1512 + + + CA1512;IDE0005;IDE0059 From af0baa101a69b53935c8b3f5b901016f1403ed9a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 1 May 2023 09:43:52 -0500 Subject: [PATCH 11/13] Runtime patch: Fix cast type to conform to Roslyn API (#16262) (#16263) --- ...x-cast-type-to-conform-to-Roslyn-API.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch diff --git a/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch b/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch new file mode 100644 index 000000000..f687d168f --- /dev/null +++ b/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 27 Apr 2023 09:51:08 -0500 +Subject: [PATCH] Fix cast type to conform to Roslyn API + +Backport: https://github.com/dotnet/runtime/pull/85466 +--- + .../gen/ComInterfaceGenerator/InlinedTypes.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs +index cb55e36b32c..ef2fe4f6d65 100644 +--- a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs ++++ b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs +@@ -53,7 +53,7 @@ static BlockSyntax Body() + GenericName( + Identifier("GetInstance"), + TypeArgumentList( +- SeparatedList( ++ SeparatedList( + new[] { PredefinedType(Token(SyntaxKind.ObjectKeyword)) }))))) + .AddArgumentListArguments( + Argument( From 147d1a7692cf68b94135c053748afeaec0d929a1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 1 May 2023 10:42:45 -0500 Subject: [PATCH 12/13] Keep deployment-tools package versions in sync (#16270) (#16278) --- eng/Versions.props | 11 ++++------- src/VSTemplateLocator/VSTemplateLocator.csproj | 2 +- src/redist/targets/GenerateMSBuildExtensions.targets | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bba7be68b..c59263f17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,6 +122,10 @@ 5.8.0 + + + 1.0.0-preview.6.23206.1 + @@ -250,12 +254,5 @@ 2.0.1-servicing-26011-01 - - - 1.0.0-preview5.1.22263.1 - diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index b5ead4054..2b71df4f6 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -15,7 +15,7 @@ - + $(NuGetPackageRoot)$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower()) Microsoft.Deployment.DotNet.Releases - $(NuGetPackageRoot)$(DotNetDeploymentReleasesPackageName.ToLower())/$(DotNetDeploymentReleasesPackageVersion.ToLower()) + $(NuGetPackageRoot)$(DotNetDeploymentReleasesPackageName.ToLower())/$(MicrosoftDeploymentDotNetReleasesVersion.ToLower()) - + From fba8d1c3b845904bd4ecb7a3e0fa4aea6ce394e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 16:30:09 +0000 Subject: [PATCH 13/13] [main] Update dependencies from dotnet/source-build-reference-packages (#16285) [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 3ad004d06..0e1737f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d3a063d6462cb2f29a0e82285d6c9b5bf87c1637 + 2eb51fd1ec260129f623e0f01abd7752b56f5513