From 96e9be769e029edcb24a49f8a279f8b950590f3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 04:37:27 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/roslyn build 20230112.12 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.4.0-6.23062.6 -> To Version 4.4.0-6.23062.12 --- 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 bf23aaabc047..b707c4ebed58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,34 +72,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 446b59c68cae..71f15c1e6857 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 - 4.4.0-6.23062.6 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 + 4.4.0-6.23062.12 $(MicrosoftNetCompilersToolsetPackageVersion) From b8ec9f7bdc68055649706a7d1827d59ca3323f07 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Fri, 13 Jan 2023 18:14:41 +0100 Subject: [PATCH 2/6] Make PublishAot an optional feature because Mono does not support it. (#28674) --- eng/SourceBuild.props | 1 + src/Layout/redist/targets/BundledSdks.targets | 2 +- src/Tasks/Common/Resources/Strings.resx | 6 +++++- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 7 ++++++- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 7 ++++++- .../targets/Microsoft.NET.Publish.targets | 2 ++ .../targets/Microsoft.NET.Sdk.props | 4 +++- .../targets/Microsoft.NET.Sdk.targets | 2 +- 19 files changed, 91 insertions(+), 17 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 61b9a9137083..2107a7184193 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,6 +8,7 @@ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf" $(InnerBuildArgs) /p:UseSharedCompilation=false + $(InnerBuildArgs) /p:NativeAotSupported=false diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets index 6f8b0fc3b333..64638ef1cff0 100644 --- a/src/Layout/redist/targets/BundledSdks.targets +++ b/src/Layout/redist/targets/BundledSdks.targets @@ -5,6 +5,6 @@ - + diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 1b1faf9abff2..fab97f444fd6 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -836,7 +836,7 @@ You may need to build the project on another operating system or architecture, o {StrBegin="NETSDK1182: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. {StrBegin="NETSDK1183: "} @@ -875,4 +875,8 @@ You may need to build the project on another operating system or architecture, o NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. {StrBegin="NETSDK1192: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 9cae172df051..e2076da7e1a7 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Sestavení nelze optimalizovat pro kompilaci s předstihem: nebyl nalezen platný balíček modulu runtime. Buď nastavte vlastnost PublishAot na hodnotu false, nebo při publikování použijte podporovaný identifikátor modulu runtime. Při cílení na .NET 7 nebo vyšší nezapomeňte obnovit balíčky s vlastností PublishAot nastavenou na hodnotu true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: Konfigurační soubor aplikace musí obsahovat kořenový element konfigurace. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 3c5fbc3f09fb..e8c5de6c46c7 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Assemblys können nicht für Ahead-of-time-Kompilierung optimiert werden: Es wurde kein gültiges Runtimepaket gefunden. Legen Sie entweder die PublishAot-Eigenschaft auf FALSE fest, oder verwenden Sie beim Veröffentlichen einen unterstützten Runtimebezeichner. Wenn Sie .NET 7 oder höher verwenden, stellen Sie sicher, dass Sie Pakete wiederherstellen, bei denen die PublishAot-Eigenschaft auf TRUE festgelegt ist. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: Die Anwendungskonfigurationsdatei muss das Stammkonfigurationselement enthalten. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 6121f4020392..aa6c314e1b76 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: No se pueden optimizar los ensamblados para la compilación Ahead of time: no se ha encontrado un paquete en tiempo de ejecución válido. Establezca la propiedad PublishAot en false o use un identificador de tiempo de ejecución compatible al publicar. Cuando el destino sea .NET 7 o una versión posterior, asegúrese de restaurar los paquetes con la propiedad PublishAot establecida en true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: El archivo de configuración de la aplicación debe tener el elemento de configuración raíz. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index c8011a2ef6e4..147c4ca50287 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Impossible d'optimiser les assemblys pour la compilation Ahead of time : un package d'exécution valide n'a pas été trouvé. Définissez la propriété PublishAot sur false ou utilisez un identificateur d'exécution pris en charge lors de la publication. Lorsque vous ciblez .NET 7 ou supérieur, assurez-vous de restaurer les packages avec la propriété PublishAot définie sur true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: Le fichier de configuration de l'application doit avoir un élément de configuration racine. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 2109529788d9..48849e34a63d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: non è possibile ottimizzare gli assembly per la compilazione Ahead Of Time perché non è stato trovato alcun pacchetto di runtime valido. Impostare la proprietà PublishAot su false oppure usare un identificatore di runtime supportato durante la pubblicazione. Quando si usa .NET 7 o versioni successive, assicurarsi di ripristinare i pacchetti con la proprietà PublishAot impostata su true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: il file di configurazione dell'applicazione deve avere un elemento di configurazione radice. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 72200fa0a601..302c4f35d35f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Ahead Of Time コンパイル用にアセンブリを最適化できません: 有効なランタイム パッケージが見つかりませんでした。PublishAot プロパティを false に設定するか、公開時に、サポートされているランタイム識別子を使用してください。.NET 7 以降を対象とする場合は、必ず PublishAot プロパティを true に設定してパッケージを復元してください。 {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: アプリケーション構成ファイルには、ルート構成要素が必要です。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index ca2c91d5c3a1..3d4632d0e935 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Ahead of Time 컴파일을 위해 어셈블리를 최적화할 수 없습니다. 유효한 런타임 패키지를 찾을 수 없습니다. PublishAot 속성을 false로 설정하거나 게시할 때 지원되는 런타임 식별자를 사용하세요. .NET 7 이상을 대상으로 하는 경우 PublishAot 속성이 true로 설정된 패키지를 복원해야 합니다. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: 애플리케이션 구성 파일에는 루트 구성 요소가 있어야 합니다. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 8449f28055dc..c0ddea4304ba 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Nie można zoptymalizować zestawów pod kątem kompilacji z wyprzedzeniem: nie znaleziono prawidłowego pakietu środowiska uruchomieniowego. Ustaw właściwość PublishAot na wartość false lub użyj obsługiwanego identyfikatora środowiska uruchomieniowego podczas publikowania. W przypadku określania wartości docelowej platformy .NET 7 lub nowszej należy przywrócić pakiety z właściwością PublishAot ustawioną na wartość true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: Plik konfiguracji aplikacji musi mieć główny element konfiguracji. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 8964e711b1ff..384b62261a78 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Não é possível otimizar assemblies para compilação antecipada: um pacote de tempo de execução válido não foi encontrado. Defina a propriedade PublishAot como false ou use um identificador de tempo de execução com suporte ao publicar. Ao direcionar o .NET 7 ou superior, certifique-se de restaurar os pacotes com a propriedade PublishAot definida como true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: o arquivo de configuração do aplicativo deve ter um elemento de configuração raiz. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 9fb52753f7b8..9e69a17e16d4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: не удалось оптимизировать сборки для компиляции Ahead Of Time: не найден допустимый пакет среды выполнения. Задайте для свойства PublishAot значение false либо используйте поддерживаемый идентификатор среды выполнения при публикации. При выборе .NET 7 или более поздней версии в качестве цели восстановите пакеты со свойством PublishAot со значением true. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: В файле конфигурации приложения должен присутствовать корневой элемент конфигурации. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 736c5276b280..2aa3d2686c5c 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: Derlemeler, AOT derlemesi için iyileştirilemedi: geçerli bir çalışma zamanı paketi bulunamadı. PublishAot özelliğini false olarak ayarlayın veya yayımlarken desteklenen bir çalışma zamanı tanımlayıcısı kullanın. .NET 7 veya üzerini hedeflerken PublishAot özelliği true olarak ayarlanmış paketleri geri yüklediğinizden emin olun. {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: Uygulama yapılandırma dosyasının kök yapılandırma öğesi olmalıdır. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index b245ebe4ad9f..4ea9fd027eb1 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: 无法优化程序集以实现提前编译: 找不到有效的运行时包。将 PublishAot 属性设置为 false，或在发布时使用支持的运行时标识符。面向 .NET 7 或更高版本时，请确保还原将 PublishAot 属性设置为 true 的包。 {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: 应用程序配置文件必须具有根配置元素。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 9568f87fd669..4f717f70fbc5 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -8,10 +8,15 @@ {StrBegin="NETSDK1076: "} - NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. + NETSDK1183: Unable to optimize assemblies for ahead-of-time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. NETSDK1183: 無法為提前編譯最佳化組件: 找不到有效的執行階段套件。請將 PublishAot 屬性設為 false，或在發佈時使用支援的執行階段識別碼。以 .NET 7 或更高版本為目標時，請務必還原套件，將 PublishAot 屬性設為 true。 {StrBegin="NETSDK1183: "} + + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1193: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1193: "} + NETSDK1070: The application configuration file must have root configuration element. NETSDK1070: 應用程式組態檔必須有根組態元素。 diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index 09f458a7909b..4f0b72b93479 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -111,6 +111,8 @@ Copyright (c) .NET Foundation. All rights reserved. '$(EnableCompressionInSingleFile)' == 'true' And '$(SelfContained)' != 'true'" ResourceName="CompressionInSingleFileRequiresSelfContained" /> + true true + false + true @@ -151,7 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 1c3ba05e59c4..1d9fbc1e973b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -1181,7 +1181,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + From 46b72c15b321560e04440034ef23b0c828b15959 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 12 Jan 2023 15:20:16 -0800 Subject: [PATCH 3/6] This call is failing on the Darwin leg in installer. (#29916) --- .../GivenThatWeWantToPublishAHelloWorldProject.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs index a7c76ba87922..09c1a2625cc2 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs @@ -69,16 +69,10 @@ public void It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_ } [Theory] - [InlineData("netcoreapp1.1")] [InlineData("netcoreapp2.0")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run(string targetFramework) { - if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) - { - return; - } - var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); var helloWorldAsset = _testAssetsManager From 574ebcacb0a071fb062f686f5bf815a125f1e30d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:40:21 -0800 Subject: [PATCH 4/6] Update to stable rtm branding --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 017ab0abb460..a4139bdcc027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,11 +12,11 @@ 7.0.200 - preview + rtm - false + true release From 1ed17cede65624bd3e1446f3c28c3e4a31887d88 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:40:34 -0800 Subject: [PATCH 5/6] Update loc build for 7.0.3xx --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index f2374a6f2439..348af4945e9b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -15,13 +15,13 @@ parameters: timeoutInMinutes: 180 jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.2xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.3xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-DOTNETSDK' - MirrorBranch: release/7.0.2xx + MirrorBranch: release/7.0.3xx MirrorRepo: sdk - ${{ if not(contains(parameters.agentOs, 'TemplateEngine')) }}: From 24720473ea25e3bd0c7f20222f28f923abd951cf Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Wed, 18 Jan 2023 15:07:34 +0100 Subject: [PATCH 6/6] port templating changes --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- .../CliTemplateEngineHost.cs | 21 -------- .../CliTestHostFactory.cs | 52 ------------------- 4 files changed, 2 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e828b9ae7ae..b4db0a8af0cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,7 +1,7 @@ - + https://github.com/dotnet/templating b1fcea318f07681249f4d9ac33005eb99e77adb1 diff --git a/eng/Versions.props b/eng/Versions.props index 44a300d26b59..f811fba63f4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.1 + 8.0.100-alpha.1.23068.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs index d278ccde493f..1992623aef22 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs @@ -83,27 +83,6 @@ public override bool TryGetHostParamDefault(string paramName, out string? value) } } - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogDiagnosticMessage(string message, string category, params string[] details) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogTiming(string label, TimeSpan duration, int depth) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogMessage(string message) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - [Obsolete("Use CreationStatusResult instead")] bool ITemplateEngineHost.OnPotentiallyDestructiveChangesDetected(IReadOnlyList changes, IReadOnlyList destructiveChanges) { diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs index ebd53d189278..6df31217536a 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs @@ -113,64 +113,12 @@ public void Dispose() #region Obsolete methods #pragma warning disable CA1041 // Provide ObsoleteAttribute message - [Obsolete] - void ITemplateEngineHost.OnSymbolUsed(string symbol, object value) - { - //do nothing - } - - [Obsolete] - bool ITemplateEngineHost.OnParameterError(ITemplateParameter parameter, string receivedValue, string message, out string newValue) - { - //do nothing - newValue = receivedValue; - return false; - } - - [Obsolete] - bool ITemplateEngineHost.OnNonCriticalError(string code, string message, string currentFile, long currentPosition) - { - //do nothing - return false; - } - - [Obsolete] - void ITemplateEngineHost.OnCriticalError(string code, string message, string currentFile, long currentPosition) - { - //do nothing - } - - [Obsolete] - void ITemplateEngineHost.LogMessage(string message) - { - //do nothing - } - [Obsolete] bool ITemplateEngineHost.OnPotentiallyDestructiveChangesDetected(IReadOnlyList changes, IReadOnlyList destructiveChanges) { //do nothing return false; } - - [Obsolete] - bool ITemplateEngineHost.OnConfirmPartialMatch(string name) - { - //do nothing - return false; - } - - [Obsolete] - void ITemplateEngineHost.LogDiagnosticMessage(string message, string category, params string[] details) - { - //do nothing - } - - [Obsolete] - void ITemplateEngineHost.LogTiming(string label, TimeSpan duration, int depth) - { - //do nothing - } #pragma warning restore CA1041 // Provide ObsoleteAttribute message #endregion }