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/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/eng/build.yml b/eng/build.yml index d7b4fb3e1c93..2f75f6dbdbb0 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')) }}: 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/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets index 4ce963aa7eaa..64638ef1cff0 100644 --- a/src/Layout/redist/targets/BundledSdks.targets +++ b/src/Layout/redist/targets/BundledSdks.targets @@ -4,5 +4,7 @@ + + diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 19eacaf188fc..d4fc63f0c196 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 and 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: "} @@ -879,7 +879,7 @@ You may need to build the project on another operating system or architecture, o NETSDK1193: If PublishSelfContained is set, it must be either true or false. The value given was '{0}'. {StrBegin="NETSDK1193: "} - + NETSDK1194: The "--output" option isn't supported when building a solution. {StrBegin="NETSDK1194: "} @@ -887,4 +887,8 @@ You may need to build the project on another operating system or architecture, o NETSDK1195: Unable to optimize assemblies for size: a valid runtime package was not found. Either set the PublishTrimmed property to false, or use a supported target framework when publishing. {StrBegin="NETSDK1195: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 1c330ab31784..11585cef5963 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 ceea646e25a4..c176574eea28 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 5e3f4a257604..c3aabf395334 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 f3f5d26db7b3..c3f74ce99491 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 b1bb2b6cea06..637ab5e4cd64 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 0f434a6c5926..9e15fee67346 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 and 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 0997e330526b..79fe7d91657d 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 and make sure to restore packages with the PublishAot property set to true. - NETSDK1183: Ahead of Time 컴파일을 위해 어셈블리를 최적화할 수 없습니다. 유효한 런타임 패키지를 찾을 수 없습니다. PublishAot 속성을 false로 설정하거나 게시할 때 지원되는 런타임 식별자를 사용하세요. .NET 7 이상을 대상으로 하는 경우 PublishAot 속성이 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 f53a3bb89270..b268f98ecab5 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 7581225389c4..dd9f4f289868 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 4ac66b621762..08d12bcf627e 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 and make sure to restore packages with the PublishAot property set to true. - NETSDK1183: не удалось оптимизировать сборки для компиляции Ahead Of Time: не найден допустимый пакет среды выполнения. Задайте для свойства PublishAot значение false либо используйте поддерживаемый идентификатор среды выполнения при публикации. При выборе .NET 7 или более поздней версии в качестве цели восстановите пакеты со свойством PublishAot со значением 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 a6fe3a5d7637..e15f42abefb9 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 and 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. + 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 8d2279a90b85..884bbf42c945 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 and make sure to restore packages with the PublishAot property set to true. - NETSDK1183: 无法优化程序集以实现提前编译: 找不到有效的运行时包。将 PublishAot 属性设置为 false，或在发布时使用支持的运行时标识符。面向 .NET 7 或更高版本时，请确保还原将 PublishAot 属性设置为 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 2fb5b3b897fc..ef0ff2beed55 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 and make sure to restore packages with the PublishAot property set to true. - NETSDK1183: 無法為提前編譯最佳化組件: 找不到有效的執行階段套件。請將 PublishAot 屬性設為 false，或在發佈時使用支援的執行階段識別碼。以 .NET 7 或更高版本為目標時，請務必還原套件，將 PublishAot 屬性設為 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: "} + + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + NETSDK1196: The SDK does not support ahead-of-time compilation. Set the PublishAot property to false. + {StrBegin="NETSDK1196: "} + 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 e44fb682a728..32c875afb470 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 @@ -116,6 +116,8 @@ Copyright (c) .NET Foundation. All rights reserved. '$(EnableCompressionInSingleFile)' == 'true' And '$(SelfContained)' != 'true'" ResourceName="CompressionInSingleFileRequiresSelfContained" /> + true true + false + true @@ -151,6 +153,8 @@ 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 68a23d20afe5..75d0dfac4021 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 @@ -1186,7 +1186,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + 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 }