From 742829507418c36f2a7287427857fd5b8fb78d54 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 11 Oct 2022 14:53:20 -0700 Subject: [PATCH 01/69] Add test that correctly fails atm --- .../RuntimeIdentifiersTests.cs | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index facaa4ac7ce5..2cd116d33b61 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Text; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.NET.TestFramework; @@ -218,5 +219,36 @@ public void DuplicateRuntimeIdentifiers() .Pass(); } + + [Fact] + public void It_Publishes_Successfully_With_RID_Requiring_Properties_And_RuntimeIdentifierS_but_no_RuntimeIdentifier() + { + var targetFramework = ToolsetInfo.CurrentTargetFramework; + var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + var testAsset = _testAssetsManager + .CopyTestAsset("HelloWorld") + .WithSource() + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifiers", runtimeIdentifier)); + propertyGroup.Add(new XElement(ns + "PublishReadyToRun", "true")); + }); + + var buildCommand = new BuildCommand(testAsset); + buildCommand + .Execute() + .Should() + .Pass(); + + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier); + + var publishCommand = new PublishCommand(testAsset); + publishCommand + .Execute() + .Should() + .Pass(); + } } } From 519fbdb79f0629a8ce60e30cdc4a4ebdda4254c7 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 11 Oct 2022 15:02:01 -0700 Subject: [PATCH 02/69] Imply RID For RuntimeIdentifiers --- .../Microsoft.NET.RuntimeIdentifierInference.targets | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 84b21ee0dd82..81f89c806192 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -64,7 +64,6 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - From aea7a0fbf1ae2376ca5265ac7e38b98984a42cd3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 13 Oct 2022 10:33:00 -0700 Subject: [PATCH 03/69] Add loc locked to two of the strings to help the translators and serve as an example going forward --- .../dotnet/commands/dotnet-new/LocalizableStrings.resx | 3 ++- .../commands/dotnet-new/xlf/LocalizableStrings.cs.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.de.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.es.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.fr.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.it.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.ja.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.ko.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.pl.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../commands/dotnet-new/xlf/LocalizableStrings.tr.xlf | 8 ++++---- .../dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf | 8 ++++---- .../dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf | 8 ++++---- 14 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx index 2b4463c40c02..5f6fbda0bd6a 100644 --- a/src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx @@ -273,7 +273,7 @@ Run 'dotnet restore {0}' to restore the project. - do not translate 'dotnet restore {0}' + {Locked="dotnet restore {0}"} Project context @@ -291,5 +291,6 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. + {Locked="dotnet workload search"} \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf index 70af3a860052..ccea9ccae58d 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Spuštěním příkazu dotnet restore {0} projekt obnovíte. - do not translate 'dotnet restore {0}' + Spuštěním příkazu dotnet restore {0} projekt obnovíte. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Spuštěním příkazu dotnet workload search vyhledejte úlohy, které jsou k dispozici pro instalaci ve vaší sadě SDK. - + Spuštěním příkazu dotnet workload search vyhledejte úlohy, které jsou k dispozici pro instalaci ve vaší sadě SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf index 7c822cb72faf..791ab7535099 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Führen Sie "dotnet restore {0}" aus, um das Projekt wiederherzustellen. - do not translate 'dotnet restore {0}' + Führen Sie "dotnet restore {0}" aus, um das Projekt wiederherzustellen. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Führen Sie „dotnet workload search“ aus, um Workloads zu suchen, die zur Installation in Ihrem SDK verfügbar sind. - + Führen Sie „dotnet workload search“ aus, um Workloads zu suchen, die zur Installation in Ihrem SDK verfügbar sind. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf index ba7f47ed4ea4..f6e0bc7955fe 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Ejecute "dotnet restore {0}" para restaurar el proyecto. - do not translate 'dotnet restore {0}' + Ejecute "dotnet restore {0}" para restaurar el proyecto. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Ejecute "dotnet workload search" para buscar las cargas de trabajo disponibles para instalarse en el SDK. - + Ejecute "dotnet workload search" para buscar las cargas de trabajo disponibles para instalarse en el SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf index f564e6c7622f..05512f2cc1d0 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Exécutez « dotnet restore {0} » pour restaurer le projet. - do not translate 'dotnet restore {0}' + Exécutez « dotnet restore {0} » pour restaurer le projet. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Exécutez 'dotnet workload search' pour rechercher les charges de travail disponibles à installer sur votre SDK. - + Exécutez 'dotnet workload search' pour rechercher les charges de travail disponibles à installer sur votre SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf index 525935ba5476..000f91095a82 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Eseguire 'dotnet restore {0}' per ripristinare il progetto. - do not translate 'dotnet restore {0}' + Eseguire 'dotnet restore {0}' per ripristinare il progetto. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Eseguire 'dotnet workload search' per cercare i carichi di lavoro disponibili per l'installazione nell'SDK. - + Eseguire 'dotnet workload search' per cercare i carichi di lavoro disponibili per l'installazione nell'SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf index e93722b0e84f..e28ecb2f873a 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - 'dotnet restore {0}' を実行してプロジェクトを復元します。 - do not translate 'dotnet restore {0}' + 'dotnet restore {0}' を実行してプロジェクトを復元します。 + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - SDK にインストールできるワークロードを検索するには、'dotnet workload search' を実行します。 - + SDK にインストールできるワークロードを検索するには、'dotnet workload search' を実行します。 + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf index 8d831ddcc848..ea7a658df53a 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - 프로젝트를 복원하려면 'dotnet restore {0}'을(를) 실행하세요. - do not translate 'dotnet restore {0}' + 프로젝트를 복원하려면 'dotnet restore {0}'을(를) 실행하세요. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - 'dotnet 워크로드 검색'을 실행하여 SDK에 설치할 수 있는 워크로드를 검색합니다. - + 'dotnet 워크로드 검색'을 실행하여 SDK에 설치할 수 있는 워크로드를 검색합니다. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf index d75193ad6491..b21a901b7c51 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Uruchom polecenie „dotnet restore {0}”, aby przywrócić projekt. - do not translate 'dotnet restore {0}' + Uruchom polecenie „dotnet restore {0}”, aby przywrócić projekt. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Uruchom „wyszukiwanie obciążenia dotnet”, aby wyszukać obciążenia dostępne do zainstalowania w twoim zestawie SDK. - + Uruchom „wyszukiwanie obciążenia dotnet”, aby wyszukać obciążenia dostępne do zainstalowania w twoim zestawie SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf index 0a36dcc9c972..5618d56723ab 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Executar o “dotnet restore {0}” para restaurar o projeto. - do not translate 'dotnet restore {0}' + Executar o “dotnet restore {0}” para restaurar o projeto. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Execute 'pesquisa de carga de trabalho dotnet' para pesquisar cargas de trabalho disponíveis para serem instaladas em seu SDK. - + Execute 'pesquisa de carga de trabalho dotnet' para pesquisar cargas de trabalho disponíveis para serem instaladas em seu SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf index 9997a8257c09..423f39e4e300 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Выполните команду "dotnet restore {0}", чтобы восстановить проект. - do not translate 'dotnet restore {0}' + Выполните команду "dotnet restore {0}", чтобы восстановить проект. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Выполните команду "dotnet workload search", чтобы выполнить поиск среди рабочих нагрузок, доступных для установки в пакете SDK. - + Выполните команду "dotnet workload search", чтобы выполнить поиск среди рабочих нагрузок, доступных для установки в пакете SDK. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf index 1477fc489cc5..a2f5144a6ae6 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - Projeyi geri yüklemek için 'dotnet restore {0}' komutunu çalıştırın. - do not translate 'dotnet restore {0}' + Projeyi geri yüklemek için 'dotnet restore {0}' komutunu çalıştırın. + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - SDK'nıza yüklenebilecek iş yüklerini aramak için 'dotnet workload search' komutunu çalıştırın. - + SDK'nıza yüklenebilecek iş yüklerini aramak için 'dotnet workload search' komutunu çalıştırın. + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf index 3db3b71a9f06..24cbbfd8b690 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - 运行“dotnet restore {0}”以还原项目。 - do not translate 'dotnet restore {0}' + 运行“dotnet restore {0}”以还原项目。 + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - 运行“dotnet 工作负载搜索”以搜索可用于安装在 SDK 上的工作负载。 - + 运行“dotnet 工作负载搜索”以搜索可用于安装在 SDK 上的工作负载。 + {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf index 84d7d408aa9d..9b6deda086de 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf @@ -230,8 +230,8 @@ Run 'dotnet restore {0}' to restore the project. - 執行 'dotnet restore {0}' 以還原專案。 - do not translate 'dotnet restore {0}' + 執行 'dotnet restore {0}' 以還原專案。 + {Locked="dotnet restore {0}"} Project context @@ -255,8 +255,8 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - 執行 ‘dotnet 工作負載搜尋’ 以搜尋可安裝在 SDK 上的工作負載。 - + 執行 ‘dotnet 工作負載搜尋’ 以搜尋可安裝在 SDK 上的工作負載。 + {Locked="dotnet workload search"} From 6d07b9001cf607277dc81eef88c7a31dfa2f4519 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Oct 2022 15:16:23 -0700 Subject: [PATCH 04/69] Adding a few more to the list which will trigger retranslation and fix for any that are off. --- .../commands/dotnet-workload/list/LocalizableStrings.resx | 2 ++ .../dotnet-workload/list/xlf/LocalizableStrings.cs.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.de.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.es.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.fr.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.it.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.ja.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.ko.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.pl.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../dotnet-workload/list/xlf/LocalizableStrings.tr.xlf | 8 ++++---- .../list/xlf/LocalizableStrings.zh-Hans.xlf | 8 ++++---- .../list/xlf/LocalizableStrings.zh-Hant.xlf | 8 ++++---- 14 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx index b8f2c0826571..b7a929ae43e1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx @@ -122,8 +122,10 @@ Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. + {Locked="dotnet workload update"} Use `dotnet workload search` to find additional workloads to install. + {Locked="dotnet workload search"} \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf index 47bdd697b3e6..f3c7fc9b48ca 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Pokud chcete najít další úlohy, které se mají nainstalovat, použijte vyhledávání úloh dotnet. - + Pokud chcete najít další úlohy, které se mají nainstalovat, použijte vyhledávání úloh dotnet. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Aktualizace jsou k dispozici pro následující úlohy: {0}. Pokud chcete získat nejnovější verzi, spusťte aktualizaci úlohy dotnet. - + Aktualizace jsou k dispozici pro následující úlohy: {0}. Pokud chcete získat nejnovější verzi, spusťte aktualizaci úlohy dotnet. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf index 178cf16ce8ff..62e5af47ffdf 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Verwenden Sie „dotnet workload search“, um zusätzliche zu installierende Workloads zu finden. - + Verwenden Sie „dotnet workload search“, um zusätzliche zu installierende Workloads zu finden. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Updates sind für die folgenden Workloads verfügbar: {0}. Führen Sie „dotnet workload update“ aus, um die neueste Updates zu erhalten. - + Updates sind für die folgenden Workloads verfügbar: {0}. Führen Sie „dotnet workload update“ aus, um die neueste Updates zu erhalten. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf index c226001cbf9f..f6a89ed99d0c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Use "dotnet workload search" para buscar cargas de trabajo adicionales para instalar. - + Use "dotnet workload search" para buscar cargas de trabajo adicionales para instalar. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Hay actualizaciones disponibles para las siguientes cargas de trabajo: {0}. Ejecute "dotnet workload update" para obtener la versión más reciente. - + Hay actualizaciones disponibles para las siguientes cargas de trabajo: {0}. Ejecute "dotnet workload update" para obtener la versión más reciente. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf index 56b60d138442..59ba62c82d72 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Utilisez « recherche de la charge de travail dotnet » pour rechercher d’autres charges de travail à installer. - + Utilisez « recherche de la charge de travail dotnet » pour rechercher d’autres charges de travail à installer. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Des mises à jour sont disponibles pour les charges de travail suivantes : {0}. Exécutez `dotnet workload update` pour obtenir la dernière version. - + Des mises à jour sont disponibles pour les charges de travail suivantes : {0}. Exécutez `dotnet workload update` pour obtenir la dernière version. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf index bd07dcb5c248..19471bd9a220 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Utilizzare la 'ricerca del carico di lavoro DotNet' per trovare i carichi di lavoro aggiuntivi da installare. - + Utilizzare la 'ricerca del carico di lavoro DotNet' per trovare i carichi di lavoro aggiuntivi da installare. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Gli aggiornamenti sono disponibili per i carichi di lavoro seguenti: {0}. Per ottenere la versione più recente, eseguire 'dotnet workload update'. - + Gli aggiornamenti sono disponibili per i carichi di lavoro seguenti: {0}. Per ottenere la versione più recente, eseguire 'dotnet workload update'. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf index 2abe9314869a..0ef97b1f505f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - `dotnet ワークロード検索` を使用して追加ワークロードを検出し、インストールします。 - + `dotnet ワークロード検索` を使用して追加ワークロードを検出し、インストールします。 + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - 次のワークロードについて更新プログラムを入手可能です: {0}。最新版を取得するには、`dotnet workload update` を実行します。 - + 次のワークロードについて更新プログラムを入手可能です: {0}。最新版を取得するには、`dotnet workload update` を実行します。 + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf index 9c3c9f4fe8d2..8c0063c83f61 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - 'dotnet 워크로드 검색'을 사용하여 설치할 추가 워크로드를 찾습니다. - + 'dotnet 워크로드 검색'을 사용하여 설치할 추가 워크로드를 찾습니다. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - 다음 워크로드에 대한 업데이트를 사용할 수 있습니다. {0}. 최신 버전을 받으려면 `dotnet 워크로드 업데이트`를 실행하세요. - + 다음 워크로드에 대한 업데이트를 사용할 수 있습니다. {0}. 최신 버전을 받으려면 `dotnet 워크로드 업데이트`를 실행하세요. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf index c3ca428e7dac..9df35a953e9a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Użyj polecenia „dotnet workload search”, aby znaleźć dodatkowe obciążenia do zainstalowania. - + Użyj polecenia „dotnet workload search”, aby znaleźć dodatkowe obciążenia do zainstalowania. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Aktualizacje są dostępne dla następujących obciążeń: {0}. Uruchom polecenie „aktualizacja obciążenia dotnet”, aby uzyskać najnowszą wersję. - + Aktualizacje są dostępne dla następujących obciążeń: {0}. Uruchom polecenie „aktualizacja obciążenia dotnet”, aby uzyskać najnowszą wersję. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf index d178dd696f6d..94977695dad6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Use 'pesquisa de carga de trabalho do dotnet' para encontrar cargas de trabalho adicionais a serem instaladas. - + Use 'pesquisa de carga de trabalho do dotnet' para encontrar cargas de trabalho adicionais a serem instaladas. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - As atualizações estão disponíveis para as seguintes cargas de trabalho(s): {0}. Execute `dotnet workload update` para obter o mais recente. - + As atualizações estão disponíveis para as seguintes cargas de trabalho(s): {0}. Execute `dotnet workload update` para obter o mais recente. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf index 58901abbfbc6..c20dbbd529c3 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Используйте "Поиск рабочей нагрузки DotNet", чтобы найти дополнительные рабочие нагрузки для установки. - + Используйте "Поиск рабочей нагрузки DotNet", чтобы найти дополнительные рабочие нагрузки для установки. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Обновления доступны для следующих рабочих нагрузок: {0}. Чтобы получить последнюю версию, запустите обновление рабочей нагрузки DotNet. - + Обновления доступны для следующих рабочих нагрузок: {0}. Чтобы получить последнюю версию, запустите обновление рабочей нагрузки DotNet. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf index ad5ad97c8d3c..80f5df4b845b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - Yüklenecek ek iş yüklerini bulmak için `dotnet workload search` kullanın. - + Yüklenecek ek iş yüklerini bulmak için `dotnet workload search` kullanın. + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Şu iş yükleri için güncelleştirmeler var: {0}. En son sürümü almak için `dotnet workload update` çalıştırın. - + Şu iş yükleri için güncelleştirmeler var: {0}. En son sürümü almak için `dotnet workload update` çalıştırın. + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf index e3428ecd0b3a..d54540c7591a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - 使用“dotnet 工作负载搜索”查找要安装的其他工作负载。 - + 使用“dotnet 工作负载搜索”查找要安装的其他工作负载。 + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - 以下工作负载有可用的更新: {0}。请运行 `dotnet workload update` 以获取最新版本。 - + 以下工作负载有可用的更新: {0}。请运行 `dotnet workload update` 以获取最新版本。 + {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf index 6c13393f4fd5..1a3e1a11fcd6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf @@ -9,13 +9,13 @@ Use `dotnet workload search` to find additional workloads to install. - 使用 `dotnet workload search` 尋找其他要安裝的工作負載。 - + 使用 `dotnet workload search` 尋找其他要安裝的工作負載。 + {Locked="dotnet workload search"} Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - 以下工作負載有可用的更新: {0}。執行 `dotnet workload update` 以取得最新更新。 - + 以下工作負載有可用的更新: {0}。執行 `dotnet workload update` 以取得最新更新。 + {Locked="dotnet workload update"} From 6018960e7b496760bf56c53efcac03780d6d4a57 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 17 Oct 2022 11:44:03 -0700 Subject: [PATCH 05/69] Clean up test code --- .../RuntimeIdentifiersTests.cs | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index 2cd116d33b61..1c5e8dc057ac 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -221,28 +221,19 @@ public void DuplicateRuntimeIdentifiers() } [Fact] - public void It_Publishes_Successfully_With_RID_Requiring_Properties_And_RuntimeIdentifierS_but_no_RuntimeIdentifier() + public void PublishSuccessfullyWithRIDRequiringPropertyAndRuntimeIdentifiersNoRuntimeIdentifier() { var targetFramework = ToolsetInfo.CurrentTargetFramework; var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testAsset = _testAssetsManager - .CopyTestAsset("HelloWorld") - .WithSource() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - propertyGroup.Add(new XElement(ns + "RuntimeIdentifiers", runtimeIdentifier)); - propertyGroup.Add(new XElement(ns + "PublishReadyToRun", "true")); - }); - - var buildCommand = new BuildCommand(testAsset); - buildCommand - .Execute() - .Should() - .Pass(); + var testProject = new TestProject() + { + IsExe = true, + TargetFrameworks = targetFramework + }; - var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier); + testProject.AdditionalProperties["RuntimeIdentifiers"] = runtimeIdentifier; + testProject.AdditionalProperties["PublishReadyToRun"] = "true"; + var testAsset = _testAssetsManager.CreateTestProject(testProject); var publishCommand = new PublishCommand(testAsset); publishCommand From 74c52b2453fa9dc09b90f0dc184894a7d989a4a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 12:37:28 +0000 Subject: [PATCH 06/69] Update dependencies from https://github.com/dotnet/templating build 20221012.12 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22512.12 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59e25ce657ef..b59b289a15e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 90b4ea928260c3265949f957d9be506289d8462f + 2a23136090d96d4f2a1f1e94b4d74fa5483f9d29 - + https://github.com/dotnet/templating - 90b4ea928260c3265949f957d9be506289d8462f + 2a23136090d96d4f2a1f1e94b4d74fa5483f9d29 diff --git a/eng/Versions.props b/eng/Versions.props index 0e025a756f40..61e5cdbb1e64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.100-rtm.22507.5 + 7.0.200-alpha.1.22512.12 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.100-rtm.22507.5 + 7.0.200-alpha.1.22512.12 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 7c858d42a5eba7fd0a718c33269034ee87fd42db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 15:28:40 +0000 Subject: [PATCH 07/69] Update dependencies from https://github.com/dotnet/templating build 20221012.21 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22512.21 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b59b289a15e7..d30c9face7eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 2a23136090d96d4f2a1f1e94b4d74fa5483f9d29 + 4e6aa77e2b38005111ba6dee2740d415fba660de - + https://github.com/dotnet/templating - 2a23136090d96d4f2a1f1e94b4d74fa5483f9d29 + 4e6aa77e2b38005111ba6dee2740d415fba660de diff --git a/eng/Versions.props b/eng/Versions.props index 61e5cdbb1e64..e166a7c99345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22512.12 + 7.0.200-alpha.1.22512.21 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22512.12 + 7.0.200-alpha.1.22512.21 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From a66ecc818a97ba67d6134dc198cada6a389b9c20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 18:44:13 +0000 Subject: [PATCH 08/69] Update dependencies from https://github.com/dotnet/templating build 20221012.25 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22512.25 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d30c9face7eb..d31b6454d964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 4e6aa77e2b38005111ba6dee2740d415fba660de + 8fb43e6404e1dbbd86d3467b827ba948e47264ae - + https://github.com/dotnet/templating - 4e6aa77e2b38005111ba6dee2740d415fba660de + 8fb43e6404e1dbbd86d3467b827ba948e47264ae diff --git a/eng/Versions.props b/eng/Versions.props index e166a7c99345..5110fa4869ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22512.21 + 7.0.200-alpha.1.22512.25 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22512.21 + 7.0.200-alpha.1.22512.25 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From a252aa28419539e5880237b310e3635a67b77176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 12:17:50 +0000 Subject: [PATCH 09/69] Update dependencies from https://github.com/dotnet/templating build 20221013.7 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22513.7 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d31b6454d964..ab3e37613d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 8fb43e6404e1dbbd86d3467b827ba948e47264ae + c7299f1ae16fc902f59e7283d61399c8da478a44 - + https://github.com/dotnet/templating - 8fb43e6404e1dbbd86d3467b827ba948e47264ae + c7299f1ae16fc902f59e7283d61399c8da478a44 diff --git a/eng/Versions.props b/eng/Versions.props index 5110fa4869ad..79aa60e17a1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22512.25 + 7.0.200-alpha.1.22513.7 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22512.25 + 7.0.200-alpha.1.22513.7 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 37d26bd1a17b335d8fe09231a9f1b902abd76c1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 14:13:15 +0000 Subject: [PATCH 10/69] Update dependencies from https://github.com/dotnet/templating build 20221013.9 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22513.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab3e37613d1f..90476b7283c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - c7299f1ae16fc902f59e7283d61399c8da478a44 + 1cf84795000d7f37eba57b1bd408ba54ed544000 - + https://github.com/dotnet/templating - c7299f1ae16fc902f59e7283d61399c8da478a44 + 1cf84795000d7f37eba57b1bd408ba54ed544000 diff --git a/eng/Versions.props b/eng/Versions.props index 79aa60e17a1f..aa081016e5fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22513.7 + 7.0.200-alpha.1.22513.9 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22513.7 + 7.0.200-alpha.1.22513.9 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From cf088018ce274df9e9140853963fdc47aaf8979e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 11:36:25 +0000 Subject: [PATCH 11/69] Update dependencies from https://github.com/dotnet/templating build 20221013.14 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22513.14 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90476b7283c0..11b35dc7d8c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 1cf84795000d7f37eba57b1bd408ba54ed544000 + 358ea59b415891c48cc3ffbf2b72a0a9e91009ee - + https://github.com/dotnet/templating - 1cf84795000d7f37eba57b1bd408ba54ed544000 + 358ea59b415891c48cc3ffbf2b72a0a9e91009ee diff --git a/eng/Versions.props b/eng/Versions.props index aa081016e5fd..fad19bbeca7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22513.9 + 7.0.200-alpha.1.22513.14 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22513.9 + 7.0.200-alpha.1.22513.14 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 4b0430532a8f6f2db13d1bd5c0b40ea09617542f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:53:51 +0000 Subject: [PATCH 12/69] Update dependencies from https://github.com/dotnet/templating build 20221014.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22514.5 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11b35dc7d8c4..17fdeb4aac06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 358ea59b415891c48cc3ffbf2b72a0a9e91009ee + fc16a047ff775501eeda00c18fc174d23eb044ce - + https://github.com/dotnet/templating - 358ea59b415891c48cc3ffbf2b72a0a9e91009ee + fc16a047ff775501eeda00c18fc174d23eb044ce diff --git a/eng/Versions.props b/eng/Versions.props index fad19bbeca7c..9c00a9ffc0d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22513.14 + 7.0.200-alpha.1.22514.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22513.14 + 7.0.200-alpha.1.22514.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From ec54ea16c337c2582f60c18ee5e64f16f18fd725 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Oct 2022 09:28:51 +0000 Subject: [PATCH 13/69] Update dependencies from https://github.com/dotnet/templating build 20221017.4 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22517.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17fdeb4aac06..89b5c6204279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - fc16a047ff775501eeda00c18fc174d23eb044ce + a55bff029821c8423976f298ae7bd58cecf81b40 - + https://github.com/dotnet/templating - fc16a047ff775501eeda00c18fc174d23eb044ce + a55bff029821c8423976f298ae7bd58cecf81b40 diff --git a/eng/Versions.props b/eng/Versions.props index 9c00a9ffc0d6..590a23c7446c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22514.5 + 7.0.200-alpha.1.22517.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22514.5 + 7.0.200-alpha.1.22517.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 53b2751e68edee473079863aa47d0496980eff5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Oct 2022 10:50:54 +0000 Subject: [PATCH 14/69] Update dependencies from https://github.com/dotnet/templating build 20221017.8 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22517.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89b5c6204279..03f976d7eb4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - a55bff029821c8423976f298ae7bd58cecf81b40 + 8328ca4ee6a53948184454aaa67db10c91576243 - + https://github.com/dotnet/templating - a55bff029821c8423976f298ae7bd58cecf81b40 + 8328ca4ee6a53948184454aaa67db10c91576243 diff --git a/eng/Versions.props b/eng/Versions.props index 590a23c7446c..d3bbd6167b7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22517.4 + 7.0.200-alpha.1.22517.8 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22517.4 + 7.0.200-alpha.1.22517.8 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 7a6a70f5beb2228e18b10a71ff3893dab9938fa6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Oct 2022 12:36:00 +0000 Subject: [PATCH 15/69] Update dependencies from https://github.com/dotnet/templating build 20221017.10 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22517.10 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03f976d7eb4a..f459725784f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 8328ca4ee6a53948184454aaa67db10c91576243 + acca0d9e8a552bfe4b1e5972aae4ae55fcc01a0d - + https://github.com/dotnet/templating - 8328ca4ee6a53948184454aaa67db10c91576243 + acca0d9e8a552bfe4b1e5972aae4ae55fcc01a0d diff --git a/eng/Versions.props b/eng/Versions.props index d3bbd6167b7e..93630ee96c95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22517.8 + 7.0.200-alpha.1.22517.10 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22517.8 + 7.0.200-alpha.1.22517.10 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 6b9631bc242fad66f19936cbcd298cde37cb3e1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Oct 2022 14:10:21 +0000 Subject: [PATCH 16/69] Update dependencies from https://github.com/dotnet/templating build 20221017.13 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22517.13 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f459725784f3..0a7a25afe1cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - acca0d9e8a552bfe4b1e5972aae4ae55fcc01a0d + 73f061c4d1c5f3fd51b31e2924819190cb37c4df - + https://github.com/dotnet/templating - acca0d9e8a552bfe4b1e5972aae4ae55fcc01a0d + 73f061c4d1c5f3fd51b31e2924819190cb37c4df diff --git a/eng/Versions.props b/eng/Versions.props index 93630ee96c95..be9bef71832b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22517.10 + 7.0.200-alpha.1.22517.13 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22517.10 + 7.0.200-alpha.1.22517.13 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 96f88e7a17b34a4ee1ee6ed7160502a1d39753f5 Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Mon, 17 Oct 2022 21:13:09 +0200 Subject: [PATCH 17/69] API fixes --- .../dotnet-new/DotnetAddPostActionTests.cs | 22 +++++++++---------- .../DotnetRestorePostActionTests.cs | 4 ++-- .../dotnet-new/DotnetSlnPostActionTests.cs | 14 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Tests/dotnet.Tests/dotnet-new/DotnetAddPostActionTests.cs b/src/Tests/dotnet.Tests/dotnet-new/DotnetAddPostActionTests.cs index dd8a20048b63..f84c24f4671a 100644 --- a/src/Tests/dotnet.Tests/dotnet-new/DotnetAddPostActionTests.cs +++ b/src/Tests/dotnet.Tests/dotnet-new/DotnetAddPostActionTests.cs @@ -40,7 +40,7 @@ private static string TestCsprojFile [Fact(DisplayName = nameof(AddRefFindsOneDefaultProjFileInOutputDirectory))] public void AddRefFindsOneDefaultProjFileInOutputDirectory() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.proj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(projFileFullPath, TestCsprojFile); @@ -54,7 +54,7 @@ public void AddRefFindsOneDefaultProjFileInOutputDirectory() [Fact(DisplayName = nameof(AddRefFindsOneNameConfiguredProjFileInOutputDirectory))] public void AddRefFindsOneNameConfiguredProjFileInOutputDirectory() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string fooprojFileFullPath = Path.Combine(targetBasePath, "MyApp.fooproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(fooprojFileFullPath, TestCsprojFile); @@ -69,7 +69,7 @@ public void AddRefFindsOneNameConfiguredProjFileInOutputDirectory() [Fact(DisplayName = nameof(AddRefFindsOneNameConfiguredProjFileWhenMultipleExtensionsAreAllowed))] public void AddRefFindsOneNameConfiguredProjFileWhenMultipleExtensionsAreAllowed() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string fooprojFileFullPath = Path.Combine(targetBasePath, "MyApp.fooproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(fooprojFileFullPath, TestCsprojFile); @@ -84,7 +84,7 @@ public void AddRefFindsOneNameConfiguredProjFileWhenMultipleExtensionsAreAllowed [Fact(DisplayName = nameof(AddRefIgnoresOtherProjectTypesWhenMultipleTypesAreAllowed))] public void AddRefIgnoresOtherProjectTypesWhenMultipleTypesAreAllowed() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string fooprojFileFullPath = Path.Combine(targetBasePath, "MyApp.fooproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(fooprojFileFullPath, TestCsprojFile); @@ -108,7 +108,7 @@ public void AddRefIgnoresOtherProjectTypesWhenMultipleTypesAreAllowed() [Fact(DisplayName = nameof(AddRefFindsOneDefaultProjFileInAncestorOfOutputDirectory))] public void AddRefFindsOneDefaultProjFileInAncestorOfOutputDirectory() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.xproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(projFileFullPath, TestCsprojFile); @@ -124,7 +124,7 @@ public void AddRefFindsOneDefaultProjFileInAncestorOfOutputDirectory() public void AddRefFindsMultipleDefaultProjFilesInOutputDirectory() { string projFilesOriginalContent = TestCsprojFile; - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPathOne = Path.Combine(targetBasePath, "MyApp.anysproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(projFileFullPathOne, projFilesOriginalContent); @@ -141,7 +141,7 @@ public void AddRefFindsMultipleDefaultProjFilesInOutputDirectory() public void AddRefFindsMultipleDefaultProjFilesInAncestorOfOutputDirectory() { string projFilesOriginalContent = TestCsprojFile; - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPathOne = Path.Combine(targetBasePath, "MyApp.fooproj"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(projFileFullPathOne, projFilesOriginalContent); @@ -161,7 +161,7 @@ public void AddRefCanHandleProjectFileRenames() var callback = new MockAddProjectReferenceCallback(); DotnetAddPostActionProcessor actionProcessor = new(callback.AddPackageReference, callback.AddProjectReference); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); string referencedProjFileFullPath = Path.Combine(targetBasePath, "NewName.csproj"); @@ -189,7 +189,7 @@ public void AddRefCanHandleProjectFilesWithoutRenames() var callback = new MockAddProjectReferenceCallback(); DotnetAddPostActionProcessor actionProcessor = new(callback.AddPackageReference, callback.AddProjectReference); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); string referencedProjFileFullPath = Path.Combine(targetBasePath, "Reference.csproj"); @@ -216,7 +216,7 @@ public void AddRefCanTargetASingleProjectWithAJsonArray() var callback = new MockAddProjectReferenceCallback(); DotnetAddPostActionProcessor actionProcessor = new(callback.AddPackageReference, callback.AddProjectReference); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); var args = new Dictionary() { { "targetFiles", "[\"MyApp.csproj\"]" }, { "referenceType", "package" }, { "reference", "System.Net.Json" } }; @@ -242,7 +242,7 @@ public void AddRefCanTargetASingleProjectWithTheProjectName() var callback = new MockAddProjectReferenceCallback(); DotnetAddPostActionProcessor actionProcessor = new(callback.AddPackageReference, callback.AddProjectReference); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); var args = new Dictionary() { { "targetFiles", "MyApp.csproj" }, { "referenceType", "package" }, { "reference", "System.Net.Json" } }; diff --git a/src/Tests/dotnet.Tests/dotnet-new/DotnetRestorePostActionTests.cs b/src/Tests/dotnet.Tests/dotnet-new/DotnetRestorePostActionTests.cs index cd1ce153e758..5f1aa15855fd 100644 --- a/src/Tests/dotnet.Tests/dotnet-new/DotnetRestorePostActionTests.cs +++ b/src/Tests/dotnet.Tests/dotnet-new/DotnetRestorePostActionTests.cs @@ -28,7 +28,7 @@ public void DotnetRestoreCanTargetASingleProjectWithAJsonArray() var callback = new MockDotnetRestoreCallback(); DotnetRestorePostActionProcessor actionProcessor = new(callback.RestoreProject); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); var args = new Dictionary() { { "files", "[\"MyApp.csproj\"]" } }; @@ -53,7 +53,7 @@ public void DotnetRestoreCanTargetASingleProjectWithTheProjectName() var callback = new MockDotnetRestoreCallback(); DotnetRestorePostActionProcessor actionProcessor = new(callback.RestoreProject); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); var args = new Dictionary() { { "files", "MyApp.csproj" } }; diff --git a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs index f7a00a49e81d..5cd2b77596e1 100644 --- a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs +++ b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs @@ -26,7 +26,7 @@ public DotnetSlnPostActionTests(EnvironmentSettingsHelper environmentSettingsHel [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindSolutionFileAtOutputPath))] public void AddProjectToSolutionPostActionFindSolutionFileAtOutputPath() { - string targetBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string solutionFileFullPath = Path.Combine(targetBasePath, "MySln.sln"); _engineEnvironmentSettings.Host.FileSystem.WriteAllText(solutionFileFullPath, string.Empty); @@ -38,7 +38,7 @@ public void AddProjectToSolutionPostActionFindSolutionFileAtOutputPath() [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindsOneProjectToAdd))] public void AddProjectToSolutionPostActionFindsOneProjectToAdd() { - string outputBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string outputBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); IPostAction postAction = new MockPostAction() { ActionId = DotnetSlnPostActionProcessor.ActionProcessorId, @@ -58,7 +58,7 @@ public void AddProjectToSolutionPostActionFindsOneProjectToAdd() [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindsMultipleProjectsToAdd))] public void AddProjectToSolutionPostActionFindsMultipleProjectsToAdd() { - string outputBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string outputBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); IPostAction postAction = new MockPostAction() { ActionId = DotnetSlnPostActionProcessor.ActionProcessorId, @@ -106,7 +106,7 @@ public void AddProjectToSolutionPostActionDoesntFindProjectOutOfRange() [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindsMultipleProjectsToAddWithOutputBasePath))] public void AddProjectToSolutionPostActionFindsMultipleProjectsToAddWithOutputBasePath() { - string outputBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string outputBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); IPostAction postAction = new MockPostAction() { @@ -140,7 +140,7 @@ public void AddProjectToSolutionPostActionFindsMultipleProjectsToAddWithOutputBa [Fact(DisplayName = nameof(AddProjectToSolutionPostActionWithoutPrimaryOutputIndexesWithOutputBasePath))] public void AddProjectToSolutionPostActionWithoutPrimaryOutputIndexesWithOutputBasePath() { - string outputBasePath = FileSystemHelpers.GetNewVirtualizedPath(_engineEnvironmentSettings); + string outputBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); IPostAction postAction = new MockPostAction() { @@ -170,7 +170,7 @@ public void AddProjectToSolutionCanTargetASingleProjectWithAJsonArray() var callback = new MockAddProjectToSolutionCallback(); var actionProcessor = new DotnetSlnPostActionProcessor(callback.AddProjectToSolution); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string slnFileFullPath = Path.Combine(targetBasePath, "MyApp.sln"); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); @@ -199,7 +199,7 @@ public void AddProjectToSolutionCanTargetASingleProjectWithTheProjectName() var callback = new MockAddProjectToSolutionCallback(); var actionProcessor = new DotnetSlnPostActionProcessor(callback.AddProjectToSolution); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string slnFileFullPath = Path.Combine(targetBasePath, "MyApp.sln"); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); From 2faa6007ea5796874c1d5b7352c6eebc5c0844b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Oct 2022 09:27:39 +0000 Subject: [PATCH 18/69] Update dependencies from https://github.com/dotnet/templating build 20221019.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22519.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a7a25afe1cf..e2ddf7ae5bb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 73f061c4d1c5f3fd51b31e2924819190cb37c4df + 1a2c1dfe64c6e8e252bae42f4ac967047a652e5d - + https://github.com/dotnet/templating - 73f061c4d1c5f3fd51b31e2924819190cb37c4df + 1a2c1dfe64c6e8e252bae42f4ac967047a652e5d diff --git a/eng/Versions.props b/eng/Versions.props index be9bef71832b..a56fe8ec644f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22517.13 + 7.0.200-alpha.1.22519.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22517.13 + 7.0.200-alpha.1.22519.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 27435cc56a33c41a814d37078722a11bcc7aa6fa Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Wed, 19 Oct 2022 17:50:57 +0200 Subject: [PATCH 19/69] API fixes --- .../dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs index 5cd2b77596e1..fe9517a06f99 100644 --- a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs +++ b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs @@ -228,7 +228,7 @@ public void AddProjectToSolutionCanPlaceProjectInSolutionRoot() var callback = new MockAddProjectToSolutionCallback(); var actionProcessor = new DotnetSlnPostActionProcessor(callback.AddProjectToSolution); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string slnFileFullPath = Path.Combine(targetBasePath, "MyApp.sln"); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); @@ -260,7 +260,7 @@ public void AddProjectToSolutionCanPlaceProjectInSolutionFolder() var callback = new MockAddProjectToSolutionCallback(); var actionProcessor = new DotnetSlnPostActionProcessor(callback.AddProjectToSolution); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string slnFileFullPath = Path.Combine(targetBasePath, "MyApp.sln"); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); @@ -292,7 +292,7 @@ public void AddProjectToSolutionFailsWhenSolutionFolderAndInRootSpecified() var callback = new MockAddProjectToSolutionCallback(); var actionProcessor = new DotnetSlnPostActionProcessor(callback.AddProjectToSolution); - string targetBasePath = _engineEnvironmentSettings.GetNewVirtualizedPath(); + string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath(); string slnFileFullPath = Path.Combine(targetBasePath, "MyApp.sln"); string projFileFullPath = Path.Combine(targetBasePath, "MyApp.csproj"); From 7926098cd468a8b211cb415790ef85d76ddd54aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 12:40:25 +0000 Subject: [PATCH 20/69] Update dependencies from https://github.com/microsoft/vstest build 20221019-03 Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221018-02 -> To Version 17.5.0-preview-20221019-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 378eced7b575..675ef154a41e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - bda34b1793ef6ddcd186b7088a6413692efb215e + 9a5bb2faf130809253b28d7ad2d434d785901025 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index c1fbe7dfbae3..fd3c6554f6d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221018-02 + 17.5.0-preview-20221019-03 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 55a74cc704eb9f7372f28f73d0fe0532c7e1eebe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 14:06:32 +0000 Subject: [PATCH 21/69] Update dependencies from https://github.com/dotnet/fsharp build 20221020.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22519.3 -> To Version 7.0.1-beta.22520.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 378eced7b575..60056aab43fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 82a30d30731031f57ad95519836abc2772ab472a - + https://github.com/dotnet/fsharp - e707dc8b7a99f0f7c4dd0195709488464b557f77 + b941491dc55d45de6a0af55e8c7848f8e688210e - + https://github.com/dotnet/fsharp - e707dc8b7a99f0f7c4dd0195709488464b557f77 + b941491dc55d45de6a0af55e8c7848f8e688210e diff --git a/eng/Versions.props b/eng/Versions.props index c1fbe7dfbae3..c5f1ee5c21d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22519.3 + 12.5.0-beta.22520.2 From aea63b35c844df13db6086f3cf5c4f381cac1054 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 16:41:32 +0000 Subject: [PATCH 22/69] Update dependencies from https://github.com/dotnet/msbuild build 20221020.4 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22519-01 -> To Version 17.5.0-preview-22520-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 378eced7b575..3b0a1fc93696 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/msbuild - 82a30d30731031f57ad95519836abc2772ab472a + 3ed9e807c5c6dfc86d54ca4b5c068758583b8f6c - + https://github.com/dotnet/msbuild - 82a30d30731031f57ad95519836abc2772ab472a + 3ed9e807c5c6dfc86d54ca4b5c068758583b8f6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c1fbe7dfbae3..374c4de209f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22519-01 + 17.5.0-preview-22520-04 $(MicrosoftBuildPackageVersion) - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 - 4.5.0-1.22519.12 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 + 4.5.0-1.22520.7 $(MicrosoftNetCompilersToolsetPackageVersion) From 68af93ab3ba58e8fa744fc07cd797094deee2b4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 01:48:38 +0000 Subject: [PATCH 26/69] Update dependencies from https://github.com/dotnet/format build 20221021.2 dotnet-format From Version 7.0.351204 -> To Version 7.0.352102 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 675ef154a41e..281237dc0132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ e707dc8b7a99f0f7c4dd0195709488464b557f77 - + https://github.com/dotnet/format - c1136d16ab588f45727fe908212b90578edc2aff + 38fce3c123b2e39dfeacb71ebb8229e96aae5268 diff --git a/eng/Versions.props b/eng/Versions.props index fd3c6554f6d7..26fdb5e9e7b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.351204 + 7.0.352102 From ce02774c86df2e6971c35ad0abbafd588c3ee6fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 01:49:17 +0000 Subject: [PATCH 27/69] Update dependencies from https://github.com/dotnet/format build 20221015.1 dotnet-format From Version 7.0.351204 -> To Version 7.0.351501 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 281237dc0132..1a6eaa53b2be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ e707dc8b7a99f0f7c4dd0195709488464b557f77 - + https://github.com/dotnet/format - 38fce3c123b2e39dfeacb71ebb8229e96aae5268 + 329fd52a961a7e9e5330a06047434813c52dba85 diff --git a/eng/Versions.props b/eng/Versions.props index 26fdb5e9e7b6..7ce82be28f34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.352102 + 7.0.351501 From f53eabcc2052037056d9d7543499973ed8675bdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 01:49:49 +0000 Subject: [PATCH 28/69] Update dependencies from https://github.com/dotnet/format build 20221020.1 dotnet-format From Version 7.0.351204 -> To Version 7.0.352001 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a6eaa53b2be..32a3ee4b57cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ e707dc8b7a99f0f7c4dd0195709488464b557f77 - + https://github.com/dotnet/format - 329fd52a961a7e9e5330a06047434813c52dba85 + 6a22157622e5da71ba0c43d23269352210bdb277 diff --git a/eng/Versions.props b/eng/Versions.props index 7ce82be28f34..eec8511cc6da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.351501 + 7.0.352001 From eacad4eae148402957c1f5e250a5da98b2c2937a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 03:11:19 +0000 Subject: [PATCH 29/69] Update dependencies from https://github.com/dotnet/roslyn build 20221020.13 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22519.12 -> To Version 4.5.0-1.22520.13 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef8e54a7adbe..44940a65ceac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ c1136d16ab588f45727fe908212b90578edc2aff - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/roslyn - dcf7c68e359beaf06b6be10057aea96707eb74ce + 9ec682f330b5a8779b4676a81f11718b5c8ef209 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 63553021b1c4..92ac6c690cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 - 4.5.0-1.22520.7 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 + 4.5.0-1.22520.13 $(MicrosoftNetCompilersToolsetPackageVersion) From 1d5fde825dfbcc8fde030880fe9d2c7a4f1e368b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 08:39:12 +0000 Subject: [PATCH 30/69] Update dependencies from https://github.com/dotnet/msbuild build 20221021.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22519-01 -> To Version 17.5.0-preview-22521-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b0a1fc93696..d5d2e80a7cf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/msbuild - 3ed9e807c5c6dfc86d54ca4b5c068758583b8f6c + 58c672337b92d9c9975a70ac445a3a4330fa2940 - + https://github.com/dotnet/msbuild - 3ed9e807c5c6dfc86d54ca4b5c068758583b8f6c + 58c672337b92d9c9975a70ac445a3a4330fa2940 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 374c4de209f0..87949ef5cb8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22520-04 + 17.5.0-preview-22521-01 $(MicrosoftBuildPackageVersion) - 7.0.352001 + 7.0.352103 From dbfdd23d63af6c29260c7318558b46396ae9b6d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 14:43:12 +0000 Subject: [PATCH 32/69] Update dependencies from https://github.com/dotnet/templating build 20221021.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22521.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2ddf7ae5bb5..e30efef84fcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 1a2c1dfe64c6e8e252bae42f4ac967047a652e5d + 5cc23edf435ac836b02bf3e8db69878449e1723e - + https://github.com/dotnet/templating - 1a2c1dfe64c6e8e252bae42f4ac967047a652e5d + 5cc23edf435ac836b02bf3e8db69878449e1723e diff --git a/eng/Versions.props b/eng/Versions.props index a56fe8ec644f..10c5e51127b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22519.1 + 7.0.200-alpha.1.22521.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22519.1 + 7.0.200-alpha.1.22521.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 1468b50c25568b87cea9933097e794d1143eccaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 16:07:49 +0000 Subject: [PATCH 33/69] Update dependencies from https://github.com/dotnet/templating build 20221021.6 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22521.6 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e30efef84fcd..2b70c801c61c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 5cc23edf435ac836b02bf3e8db69878449e1723e + 68837cb9b7ec8dc43a512c49eef8b6780202c6b4 - + https://github.com/dotnet/templating - 5cc23edf435ac836b02bf3e8db69878449e1723e + 68837cb9b7ec8dc43a512c49eef8b6780202c6b4 diff --git a/eng/Versions.props b/eng/Versions.props index 10c5e51127b1..0543b0982d6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22521.2 + 7.0.200-alpha.1.22521.6 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22521.2 + 7.0.200-alpha.1.22521.6 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From e9d2807f1ccdd6356aff4bfbed6db0d11fc7acf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:35:08 -0700 Subject: [PATCH 34/69] Update dependencies from https://github.com/microsoft/vstest build 20221021-01 (#28704) Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221019-03 -> To Version 17.5.0-preview-20221021-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a10af37e3b6f..eebaa38a02b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - 9a5bb2faf130809253b28d7ad2d434d785901025 + 46ca47823c5f9ca1d2373be9eb29d6281286c42a https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index f08df2862ef9..c5ddf651ec6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221019-03 + 17.5.0-preview-20221021-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From b9d4030324d63004063949600462230deb9ba02b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:35:15 -0700 Subject: [PATCH 35/69] Update dependencies from https://github.com/dotnet/fsharp build 20221021.3 (#28708) Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22520.2 -> To Version 7.0.1-beta.22521.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eebaa38a02b0..736eaf40661d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 82a30d30731031f57ad95519836abc2772ab472a - + https://github.com/dotnet/fsharp - b941491dc55d45de6a0af55e8c7848f8e688210e + 3b29890f7b78899f951ad3432579acf6e8c70611 - + https://github.com/dotnet/fsharp - b941491dc55d45de6a0af55e8c7848f8e688210e + 3b29890f7b78899f951ad3432579acf6e8c70611 diff --git a/eng/Versions.props b/eng/Versions.props index c5ddf651ec6b..597bb022b5a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22520.2 + 12.5.0-beta.22521.3 From 0492a665b52bc853a7a7cd85c176677aaa337955 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 18:30:32 +0000 Subject: [PATCH 36/69] Update dependencies from https://github.com/dotnet/format build 20221021.4 dotnet-format From Version 7.0.352001 -> To Version 7.0.352104 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 278cd782c6c9..224539149191 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ b941491dc55d45de6a0af55e8c7848f8e688210e - + https://github.com/dotnet/format - ac47db802803ca6a40feddbad8c748da30ba3d92 + 2d7dc85dc1c9856a77a3ccdbfcfac47a9f5ce05d diff --git a/eng/Versions.props b/eng/Versions.props index 1a44eed7f98c..bb551bbf834b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.352103 + 7.0.352104 From 9b52586c46a0b2244937b8ccc1c1633b6bd7f927 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 20:06:59 +0000 Subject: [PATCH 37/69] Update dependencies from https://github.com/dotnet/format build 20221021.6 dotnet-format From Version 7.0.352001 -> To Version 7.0.352106 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 224539149191..c4726167b0e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ b941491dc55d45de6a0af55e8c7848f8e688210e - + https://github.com/dotnet/format - 2d7dc85dc1c9856a77a3ccdbfcfac47a9f5ce05d + d1b2bda711116c91e0ba43727cb202517d6f8620 diff --git a/eng/Versions.props b/eng/Versions.props index bb551bbf834b..09b4b7c55fbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.352104 + 7.0.352106 From 2f7dcaae04f3494096948b1d27f543d2966dd267 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 22:07:10 +0000 Subject: [PATCH 38/69] Update dependencies from https://github.com/dotnet/fsharp build 20221021.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22521.3 -> To Version 7.0.1-beta.22521.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 736eaf40661d..ccbf916d9e53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 82a30d30731031f57ad95519836abc2772ab472a - + https://github.com/dotnet/fsharp - 3b29890f7b78899f951ad3432579acf6e8c70611 + 49a0e2e80922016533573f4e550a6ab199006396 - + https://github.com/dotnet/fsharp - 3b29890f7b78899f951ad3432579acf6e8c70611 + 49a0e2e80922016533573f4e550a6ab199006396 diff --git a/eng/Versions.props b/eng/Versions.props index 597bb022b5a2..3d88b02b5d77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22521.3 + 12.5.0-beta.22521.4 From b8e540557e15b5054c4776f3b49011981aa37f55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Oct 2022 03:13:55 +0000 Subject: [PATCH 39/69] Update dependencies from https://github.com/dotnet/roslyn build 20221021.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22520.13 -> To Version 4.5.0-1.22521.5 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 736eaf40661d..112dbe8a9572 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 6a22157622e5da71ba0c43d23269352210bdb277 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 597bb022b5a2..caa4aad57c4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 - 4.5.0-1.22520.13 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 + 4.5.0-1.22521.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 3a0f54ec057345ca7dae00fe55b7955fb3f982b2 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sun, 23 Oct 2022 20:49:42 -0700 Subject: [PATCH 40/69] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2028017 --- .../dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf index 4f5fd12251da..795c9d137fb7 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf @@ -274,7 +274,7 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Run 'dotnet workload search' to search workloads available to be installed on your SDK. + 'dotnet workload search'을 실행하여 SDK에 설치할 수 있는 워크로드를 검색합니다. {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf index 90dae3a8d13b..e80160a06011 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf @@ -274,7 +274,7 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Run 'dotnet workload search' to search workloads available to be installed on your SDK. + Uruchom 'dotnet workload search', aby wyszukać obciążenia dostępne do zainstalowania w twoim zestawie SDK. {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf index 93f3e1637d1b..08b9dca27554 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf @@ -274,7 +274,7 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Run 'dotnet workload search' to search workloads available to be installed on your SDK. + Execute 'dotnet workload search' para pesquisar cargas de trabalho disponíveis para serem instaladas em seu SDK. {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf index 9a3423d9618f..0b2d517460e1 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf @@ -274,7 +274,7 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Run 'dotnet workload search' to search workloads available to be installed on your SDK. + 运行'dotnet workload search' 以搜索可用于安装在 SDK 上的工作负载。 {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf index f433c33eee3f..d68b99acfed2 100644 --- a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf @@ -274,7 +274,7 @@ Run 'dotnet workload search' to search workloads available to be installed on your SDK. - Run 'dotnet workload search' to search workloads available to be installed on your SDK. + 執行 'dotnet workload search' 以搜尋可安裝在 SDK 上的工作負載。 {Locked="dotnet workload search"} From 81ed7c2f873b8cac12d70b1e1fe27c71a99e95ef Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sun, 23 Oct 2022 20:56:14 -0700 Subject: [PATCH 41/69] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2028017 --- .../commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf | 2 +- .../commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf | 2 +- .../commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf | 2 +- .../commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf index f98bc0b7ec44..dbc5c5d7eb39 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. + Aktualizace jsou k dispozici pro následující úlohy: {0}. Pokud chcete získat nejnovější verzi, spusťte aktualizaci úlohy dotnet (`dotnet workload update`). {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf index d5f4b2d6825c..1cbcf50e4808 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf @@ -9,7 +9,7 @@ Use `dotnet workload search` to find additional workloads to install. - Use `dotnet workload search` to find additional workloads to install. + Utilizzare la `dotnet workload search` per trovare i carichi di lavoro aggiuntivi da installare. {Locked="dotnet workload search"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf index b71f03d54cbd..d831a98b9807 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. + Aktualizacje są dostępne dla następujących obciążeń: {0}. Uruchom polecenie `dotnet workload update`, aby uzyskać najnowszą wersję. {Locked="dotnet workload update"} diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf index d6b7d9feb132..7ddcbf47db14 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. - Updates are available for the following workload(s): {0}. Run `dotnet workload update` to get the latest. + Обновления доступны для следующих рабочих нагрузок: {0}. Чтобы получить последнюю версию, запустите `dotnet workload update`. {Locked="dotnet workload update"} From 1fc08a4ce835d4fbcd6a6a2de539612ad17af69b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 14:33:19 +0000 Subject: [PATCH 42/69] Update dependencies from https://github.com/dotnet/msbuild build 20221024.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22521-01 -> To Version 17.5.0-preview-22524-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec298f8c9222..58015d144cb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/msbuild - 58c672337b92d9c9975a70ac445a3a4330fa2940 + 9f72f0ef257a71ae74c723ec749b3353d096536f - + https://github.com/dotnet/msbuild - 58c672337b92d9c9975a70ac445a3a4330fa2940 + 9f72f0ef257a71ae74c723ec749b3353d096536f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 57cab711f3ba..ff752115c7bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22521-01 + 17.5.0-preview-22524-01 $(MicrosoftBuildPackageVersion) - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 - 4.5.0-1.22521.5 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 + 4.5.0-1.22524.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 317b48e7707791d731263de72ffe5db98328e37d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 08:54:11 -0700 Subject: [PATCH 45/69] Update dependencies from https://github.com/microsoft/vstest build 20221024-01 (#28733) Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221021-01 -> To Version 17.5.0-preview-20221024-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cae82f72f8d7..4dd4f44287c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - 46ca47823c5f9ca1d2373be9eb29d6281286c42a + d194886e7de0b6bb21a22e0b85472fa6a3b7793a https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6936d074fe8a..b77820fc33f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221021-01 + 17.5.0-preview-20221024-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 1e9ebabd9cc4977df8d1a1ea5cd59bcce9bcf3e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 16:58:32 +0000 Subject: [PATCH 46/69] Update dependencies from https://github.com/dotnet/templating build 20221024.8 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22507.5 -> To Version 7.0.200-alpha.1.22524.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b70c801c61c..48103512bec0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 68837cb9b7ec8dc43a512c49eef8b6780202c6b4 + a3f714f94e3bdd206eb64d89771e4fbf30c9640f - + https://github.com/dotnet/templating - 68837cb9b7ec8dc43a512c49eef8b6780202c6b4 + a3f714f94e3bdd206eb64d89771e4fbf30c9640f diff --git a/eng/Versions.props b/eng/Versions.props index 0543b0982d6c..7a5f8da07205 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.22521.6 + 7.0.200-alpha.1.22524.8 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.22521.6 + 7.0.200-alpha.1.22524.8 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 36f17ad68fd387834116893cc4267ba9e7ad16ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 21:05:20 +0000 Subject: [PATCH 47/69] Update dependencies from https://github.com/dotnet/fsharp build 20221024.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22521.4 -> To Version 7.0.1-beta.22524.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dd4f44287c0..db7b4e7e01bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 58c672337b92d9c9975a70ac445a3a4330fa2940 - + https://github.com/dotnet/fsharp - 49a0e2e80922016533573f4e550a6ab199006396 + 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 - + https://github.com/dotnet/fsharp - 49a0e2e80922016533573f4e550a6ab199006396 + 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 diff --git a/eng/Versions.props b/eng/Versions.props index b77820fc33f0..fbc7c7d0556d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22521.4 + 12.5.0-beta.22524.2 From cff6a5b589f1219ee7f6c1b1267a154a4278e427 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 22:35:15 +0000 Subject: [PATCH 48/69] Update dependencies from https://github.com/dotnet/roslyn build 20221024.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22524.1 -> To Version 4.5.0-1.22524.5 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dd4f44287c0..7b7048a5385e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ d1b2bda711116c91e0ba43727cb202517d6f8620 - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 03cf426ea3d498156ad2090967d83fec7af4deeb https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b77820fc33f0..7b6ffc228582 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 - 4.5.0-1.22524.1 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 + 4.5.0-1.22524.5 $(MicrosoftNetCompilersToolsetPackageVersion) From e674fdeec242be97834844dee16d1b7d2b6e8b69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 04:35:55 +0000 Subject: [PATCH 49/69] Update dependencies from https://github.com/dotnet/roslyn build 20221024.15 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22524.1 -> To Version 4.5.0-1.22524.15 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b7048a5385e..d3a8e09a5f5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ d1b2bda711116c91e0ba43727cb202517d6f8620 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/roslyn - 03cf426ea3d498156ad2090967d83fec7af4deeb + 34530dacae1efc796937b41a0e1cf55fd93c7a10 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7b6ffc228582..ef0daa3f3507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 - 4.5.0-1.22524.5 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 + 4.5.0-1.22524.15 $(MicrosoftNetCompilersToolsetPackageVersion) From eec6f3213a15c541392e0399cf8f5f536c55d58a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 12:56:26 +0000 Subject: [PATCH 50/69] Update dependencies from https://github.com/microsoft/vstest build 20221025-01 Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221024-01 -> To Version 17.5.0-preview-20221025-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e52f2c3cd8ce..bd012ea127ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - d194886e7de0b6bb21a22e0b85472fa6a3b7793a + 9d12a2e26fda590fd384668271011fcd8f475209 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index bbdd3d1a396f..5e1d8dd7e27c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221024-01 + 17.5.0-preview-20221025-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 6157f94d0811b62e6c184c0c9cc74b28167a1346 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 15:36:33 +0000 Subject: [PATCH 51/69] Update dependencies from https://github.com/dotnet/fsharp build 20221025.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22524.2 -> To Version 7.0.1-beta.22525.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e52f2c3cd8ce..be3d3cdb2620 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 9f72f0ef257a71ae74c723ec749b3353d096536f - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + 90f5b1ed0befe8337b923860d29dcd62d4735aef - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + 90f5b1ed0befe8337b923860d29dcd62d4735aef diff --git a/eng/Versions.props b/eng/Versions.props index bbdd3d1a396f..f88272acffce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22524.2 + 12.5.0-beta.22525.1 From ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:43:47 -0700 Subject: [PATCH 52/69] Update dependencies from https://github.com/dotnet/msbuild build 20221025.1 (#28750) Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22524-01 -> To Version 17.5.0-preview-22525-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e52f2c3cd8ce..d9536f6ef51c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/msbuild - 9f72f0ef257a71ae74c723ec749b3353d096536f + 3b7246b650398f47b6028e2673b06902613dc46e - + https://github.com/dotnet/msbuild - 9f72f0ef257a71ae74c723ec749b3353d096536f + 3b7246b650398f47b6028e2673b06902613dc46e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bbdd3d1a396f..94fa674898ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22524-01 + 17.5.0-preview-22525-01 $(MicrosoftBuildPackageVersion) - 17.5.0-preview-22525-01 + 17.5.0-preview-22526-01 $(MicrosoftBuildPackageVersion) - 6.7.0 + 6.8.0 6.1.0 7.0.0-beta.22511.2 4.8.2 From 8be582cf095ee3791cc3f3bf6079b6ccd2e493b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 12:39:59 +0000 Subject: [PATCH 56/69] Update dependencies from https://github.com/microsoft/vstest build 20221026-02 Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221024-01 -> To Version 17.5.0-preview-20221026-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd012ea127ef..d52c5a1f2cdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - 9d12a2e26fda590fd384668271011fcd8f475209 + 0b2ae532ae3f2eefea9a40bc95d341ab58c79ad0 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 5e1d8dd7e27c..58871cc06fc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221025-01 + 17.5.0-preview-20221026-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From dd792bb314e0e1732707b1f6e516f9d391371744 Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Wed, 26 Oct 2022 14:10:47 +0200 Subject: [PATCH 57/69] adjusted test --- src/Tests/dotnet-new.Tests/DotnetNewInstallTests.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/DotnetNewInstallTests.cs b/src/Tests/dotnet-new.Tests/DotnetNewInstallTests.cs index 634446e0cbe2..d039ee4298b4 100644 --- a/src/Tests/dotnet-new.Tests/DotnetNewInstallTests.cs +++ b/src/Tests/dotnet-new.Tests/DotnetNewInstallTests.cs @@ -563,7 +563,6 @@ public void CannotInstallTemplateWithoutMandatoryConfig() string home = CreateTemporaryFolder(folderName: "Home"); string invalidTemplatePath = GetTestTemplateLocation("Invalid/MissingMandatoryConfig"); new DotnetNewCommand(_log, "-i", invalidTemplatePath) - .WithDebug() .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -571,11 +570,7 @@ public void CannotInstallTemplateWithoutMandatoryConfig() .ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining($"Error: Failed to load template from {invalidTemplatePath}") - .And.HaveStdOutContaining($" Missing 'identity'.") - .And.HaveStdOutContaining($" Missing 'name'.") - .And.HaveStdOutContaining($" Missing 'shortName'.") - .And.HaveStdOutContaining($" The template root is outside the specified install source location.") - .And.HaveStdOutContaining($" Source location './' is outside the specified install source location.") + .And.HaveStdOutContaining($"Details: The template root is outside the specified install source location.") .And.HaveStdOutContaining($"No templates were found in the package {invalidTemplatePath}."); } From c7155ee6e33ce7a93f61c60157ce250dd1375db1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 20:18:53 +0000 Subject: [PATCH 58/69] Update dependencies from https://github.com/dotnet/fsharp build 20221026.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22525.1 -> To Version 7.0.1-beta.22526.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf63242540a2..b4a3935e6eeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/dotnet/fsharp - 90f5b1ed0befe8337b923860d29dcd62d4735aef + f9dc1e4f45d735aa85b654a2de5111d5ab587a99 - + https://github.com/dotnet/fsharp - 90f5b1ed0befe8337b923860d29dcd62d4735aef + f9dc1e4f45d735aa85b654a2de5111d5ab587a99 diff --git a/eng/Versions.props b/eng/Versions.props index e16be05f5f17..837277566fe2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22525.1 + 12.5.0-beta.22526.4 From 4862ff1d3a1e65d519cf6047c7e4488e60bb146f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Oct 2022 00:37:30 +0000 Subject: [PATCH 59/69] Update dependencies from https://github.com/dotnet/fsharp build 20221026.5 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22525.1 -> To Version 7.0.1-beta.22526.5 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4a3935e6eeb..9e26fc3bc25b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/dotnet/fsharp - f9dc1e4f45d735aa85b654a2de5111d5ab587a99 + 32b9429e5822d3e76672d9752f7a20f681209de8 - + https://github.com/dotnet/fsharp - f9dc1e4f45d735aa85b654a2de5111d5ab587a99 + 32b9429e5822d3e76672d9752f7a20f681209de8 diff --git a/eng/Versions.props b/eng/Versions.props index 837277566fe2..25b4902c9d27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22526.4 + 12.5.0-beta.22526.5 From e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Tue, 25 Oct 2022 05:34:54 +0000 Subject: [PATCH 60/69] Add unit tests for reserved aliases and host specific template data --- .../AliasAssignmentTests.cs | 274 ++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/AliasAssignmentTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/AliasAssignmentTests.cs index 72175c31f11e..3b7194fe16b2 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/AliasAssignmentTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/AliasAssignmentTests.cs @@ -2,7 +2,14 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // +using System.CommandLine; +using FakeItEasy; +using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.Cli.Commands; +using Microsoft.TemplateEngine.Edge; +using Microsoft.TemplateEngine.Edge.Settings; +using Microsoft.TemplateEngine.Mocks; +using Newtonsoft.Json.Linq; namespace Microsoft.TemplateEngine.Cli.UnitTests { @@ -200,5 +207,272 @@ public void CheckAliasAssignmentsMvc20() Assert.Contains("--no-restore", result["skipRestore"].Aliases); Assert.DoesNotContain(result, r => r.Value.Errors.Any()); } + + [Theory] + [InlineData("package", "--param:package")] + [InlineData("u", "-p:u")] + [InlineData("notreserved", "--notreserved")] + public void CanAssignAliasForParameterWithReservedAlias(string parameterName, string expectedContainedAlias) + { + string command = "foo"; + MockTemplateInfo[] templates = new MockTemplateInfo[] + { + new MockTemplateInfo($"{command}", identity: "foo.1", groupIdentity: "foo.group").WithParameters(parameterName) + }; + ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(); + IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true); + TemplatePackageManager templatePackageManager = A.Fake(); + + NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host); + ParseResult parseResult = myCommand.Parse($" new {command}"); + var args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult)); + TemplateGroup templateGroup = TemplateGroup + .FromTemplateList(CliTemplateInfo.FromTemplateInfo(templates, A.Fake())) + .Single(); + var templateCommands = InstantiateCommand.GetTemplateCommand(args, settings, A.Fake(), templateGroup); + Assert.Single(templateCommands); + var templateOption = templateCommands.Single().TemplateOptions[parameterName]; + Assert.Contains(expectedContainedAlias, templateOption.Aliases); + } + + [Theory] +#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672 + [MemberData(nameof(GetTemplateData))] +#pragma warning restore CA1825 // Avoid zero-length array allocations. + public void CanOverrideAliasesForParameterWithHostData(string hostJsonData, string expectedJsonResult) + { + var hostData = new HostSpecificTemplateData(string.IsNullOrEmpty(hostJsonData) ? null : JObject.Parse(hostJsonData)); + var expectedResults = JObject.Parse(expectedJsonResult); + var template = new MockTemplateInfo("foo", identity: "foo.1", groupIdentity: "foo.group"); + foreach (var expectedResult in expectedResults) + { + template.WithParameter(expectedResult.Key); + } + var hostDataLoader = A.Fake(); + A.CallTo(() => hostDataLoader.ReadHostSpecificTemplateData(template)).Returns(hostData); + TemplateGroup templateGroup = TemplateGroup.FromTemplateList( + CliTemplateInfo.FromTemplateInfo(new[] { template }, hostDataLoader)) + .Single(); + ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(); + IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true); + TemplatePackageManager templatePackageManager = A.Fake(); + NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host); + ParseResult parseResult = myCommand.Parse(" new foo"); + InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult)); + var templateCommands = InstantiateCommand.GetTemplateCommand(args, settings, templatePackageManager, templateGroup); + Assert.Single(templateCommands); + foreach (var expectedResult in expectedResults) + { + var expectedValues = expectedResult.Value!.Select(s => ((JValue)s).Value).ToArray(); + var expectedLongAlias = expectedValues[0]; + var expectedShortAlias = expectedValues[1]; + var expectedIsHidden = expectedValues[2]; + var templateOptions = templateCommands.Single().TemplateOptions; + Assert.NotNull(templateOptions); + Assert.Contains(expectedResult.Key, templateOptions.Keys); + var templateOption = templateOptions[expectedResult.Key]; + Assert.NotNull(templateOption); + Assert.True(templateOption.Aliases.Count > 0); + var longAlias = templateOption.Aliases.ElementAt(0); + var shortAlias = templateOption.Aliases.Count > 1 ? templateOption.Aliases.ElementAt(1) : null; + var isHidden = templateOption.Option.IsHidden; + Assert.Equal(expectedLongAlias, longAlias); + Assert.Equal(expectedShortAlias, shortAlias); + Assert.Equal(expectedIsHidden, isHidden); + } + } + + public static IEnumerable GetTemplateData() + { + // host data and expected option with long alias, short alias and if it is hidden: + // [0] host data + // [1] expected option : 0 - long alias, 1 - short alias, 2 - isHidden + yield return new object[] + { + string.Empty, + @"{ ""Framework"": [""--Framework"", ""-F"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + } + } + }", + @"{ ""Framework"": [""--Framework"", ""-F"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""longName"": ""targetframework"" + } + } + }", + @"{ ""Framework"": [""--targetframework"", ""-t"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""shortName"": ""fr"" + } + } + }", + @"{ ""Framework"": [""--Framework"", ""-fr"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""longName"": ""targetframework"", + ""shortName"": ""fr"" + } + } + }", + @"{ ""Framework"": [""--targetframework"", ""-fr"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""longName"": ""targetframework"", + ""shortName"": """" + } + } + }", + @"{ ""Framework"": [""--targetframework"", null, false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""isHidden"": ""true"", + ""longName"": ""targetframework"", + ""shortName"": ""fr"" + } + } + }", + @"{ ""Framework"": [""--targetframework"", ""-fr"", true] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""Framework"": { + ""isHidden"": ""false"", + ""longName"": ""targetframework"", + ""shortName"": ""fr"" + } + } + }", + @"{ ""Framework"": [""--targetframework"", ""-fr"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""install"": { + ""longName"": ""set"" + } + } + }", + @"{ ""install"": [""--set"", ""-s"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""install"": { + ""longName"": ""setup"", + ""shortName"": ""set"" + } + } + }", + @"{ ""install"": [""--setup"", ""-set"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""install"": { + ""longName"": ""set"", + ""shortName"": """" + } + } + }", + @"{ ""install"": [""--set"", null, false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""pack"": { + ""longName"": ""package"" + } + } + }", + @"{ ""pack"": [""--param:package"", ""-p"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""add"": { + ""shortName"": ""i"" + } + } + }", + @"{ ""add"": [""--add"", ""-p:i"", false] }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""delete"": { + ""longName"": ""remove"" + } + } + }", + @"{ + ""delete"": [""--remove"", ""-r"", false], + ""remove"": [""--param:remove"", ""-re"", false] + }" + }; + + yield return new object[] + { + @"{ + ""symbolInfo"": { + ""delete"": { + ""longName"": ""remove"" + } + } + }", + @"{ + ""remove"": [""--param:remove"", ""-r"", false], + ""delete"": [""--remove"", ""-re"", false] + }" + }; + } } } From d4d618322625a9f843f45f7e0c62ef4cc5414393 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:33:56 -0700 Subject: [PATCH 61/69] Update dependencies from https://github.com/microsoft/vstest build 20221026-01 (#28790) Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221026-02 -> To Version 17.5.0-preview-20221026-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e10113b8835e..126d29fbe956 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 125f673fd1cdb3cc012f62aa3ce764d2460b89eb - + https://github.com/microsoft/vstest - 0b2ae532ae3f2eefea9a40bc95d341ab58c79ad0 + 86e33e8eb2e9702afc1dcc081b55ed089331aedb https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 520ebd29ecd0..3938b1628612 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.5.0-preview-20221026-02 + 17.5.0-preview-20221026-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From ff25d0bf283a7bf50dbacf0573b2c9b7369c7e49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Oct 2022 01:16:08 +0000 Subject: [PATCH 62/69] Update dependencies from https://github.com/dotnet/roslyn build 20221027.11 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22524.15 -> To Version 4.5.0-1.22527.11 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 126d29fbe956..1671330ef9e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ d1b2bda711116c91e0ba43727cb202517d6f8620 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3938b1628612..d9d27499b034 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 - 4.5.0-1.22524.15 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 + 4.5.0-1.22527.11 $(MicrosoftNetCompilersToolsetPackageVersion) From 91936e22bc9ce74560bdeab34419c648172af7f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 05:40:41 +0000 Subject: [PATCH 63/69] Update dependencies from https://github.com/dotnet/fsharp build 20221027.3 (#28797) [release/7.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1671330ef9e5..f889aa24cbb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/dotnet/fsharp - 32b9429e5822d3e76672d9752f7a20f681209de8 + b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab - + https://github.com/dotnet/fsharp - 32b9429e5822d3e76672d9752f7a20f681209de8 + b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab diff --git a/eng/Versions.props b/eng/Versions.props index d9d27499b034..2cbb4b8f3086 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22526.5 + 12.5.0-beta.22527.3 From 93518324b8437af87abe8c9f8dcf6e6141166d84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 09:55:38 -0700 Subject: [PATCH 64/69] Update dependencies from https://github.com/dotnet/fsharp build 20221028.3 (#28806) Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22527.3 -> To Version 7.0.1-beta.22528.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f889aa24cbb8..0d8f545e75d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/dotnet/fsharp - b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab + 79ff8fe968f7f66a25665772449e73f2c21c9efe - + https://github.com/dotnet/fsharp - b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab + 79ff8fe968f7f66a25665772449e73f2c21c9efe diff --git a/eng/Versions.props b/eng/Versions.props index 2cbb4b8f3086..03f02680a7d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22527.3 + 12.5.0-beta.22528.3 From cbf383cb2a6283b3cb71ab6345d1fe1c2aabd3b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Oct 2022 21:55:46 +0000 Subject: [PATCH 65/69] Update dependencies from https://github.com/dotnet/roslyn build 20221028.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22527.11 -> To Version 4.5.0-1.22528.5 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d8f545e75d6..f7e6aae64889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ d1b2bda711116c91e0ba43727cb202517d6f8620 - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 77904ac785bbddb853161aed9eac6ca03aba0ddf https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 03f02680a7d1..576f1deaf8cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 - 4.5.0-1.22527.11 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 + 4.5.0-1.22528.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 6160f0a221a8f7f8324378fc3923c657c683cb40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Oct 2022 01:16:15 +0000 Subject: [PATCH 66/69] Update dependencies from https://github.com/dotnet/format build 20221029.1 dotnet-format From Version 7.0.352106 -> To Version 7.0.352901 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d8f545e75d6..5ee54cc2370b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ 79ff8fe968f7f66a25665772449e73f2c21c9efe - + https://github.com/dotnet/format - d1b2bda711116c91e0ba43727cb202517d6f8620 + 374e92c70d337c4635688d0e7543d880dc5708d9 diff --git a/eng/Versions.props b/eng/Versions.props index 03f02680a7d1..86ddcbaa00b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.352106 + 7.0.352901 From 9dfca0687ea7153c45903b2e1c38807dc357848e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Oct 2022 01:58:03 +0000 Subject: [PATCH 67/69] Update dependencies from https://github.com/dotnet/roslyn build 20221028.14 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22527.11 -> To Version 4.5.0-1.22528.14 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7e6aae64889..90bdbd3bd1bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ d1b2bda711116c91e0ba43727cb202517d6f8620 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 - + https://github.com/dotnet/roslyn - 77904ac785bbddb853161aed9eac6ca03aba0ddf + 785bc38801eac75a5342c3c639fcc5fd5156f263 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 576f1deaf8cb..803e779b4e3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 - 4.5.0-1.22528.5 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 + 4.5.0-1.22528.14 $(MicrosoftNetCompilersToolsetPackageVersion) From c4e68709d9be32af2ac48d7893565004cb9426cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Oct 2022 02:40:14 +0000 Subject: [PATCH 68/69] Update dependencies from https://github.com/dotnet/format build 20221029.2 dotnet-format From Version 7.0.352106 -> To Version 7.0.352902 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee54cc2370b..cfcbeb34c787 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ 79ff8fe968f7f66a25665772449e73f2c21c9efe - + https://github.com/dotnet/format - 374e92c70d337c4635688d0e7543d880dc5708d9 + f7beff0efdb20b8f22516d310279204a3fa9ef50 diff --git a/eng/Versions.props b/eng/Versions.props index 86ddcbaa00b9..b37ddbd00ca7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 7.0.352901 + 7.0.352902 From 5af986021ee96a3778bd6d2f8b175814c264c0d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Oct 2022 18:10:51 +0000 Subject: [PATCH 69/69] Update dependencies from https://github.com/dotnet/fsharp build 20221029.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22528.3 -> To Version 7.0.1-beta.22529.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d8f545e75d6..280555d2a3f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3777dcaf7edb3e86a070037ba53e742dd1872873 - + https://github.com/dotnet/fsharp - 79ff8fe968f7f66a25665772449e73f2c21c9efe + ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd - + https://github.com/dotnet/fsharp - 79ff8fe968f7f66a25665772449e73f2c21c9efe + ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd diff --git a/eng/Versions.props b/eng/Versions.props index 03f02680a7d1..f5376efc2373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.5.0-beta.22528.3 + 12.5.0-beta.22529.1