From 9a7d07ab5a163b75a7b82cf8883d32553f34dcdb Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 19 Oct 2022 15:21:40 +0200 Subject: [PATCH 1/4] Enabled source-building with mono runtime on any architecture. Adds an argument to the top-level build script to use the mono runtime, and sets the flags needed for the different repos to work with mono. --- eng/SourceBuild.props | 1 + .../tarball/content/Directory.Build.props | 5 ++ src/SourceBuild/tarball/content/build.sh | 4 ++ .../content/repos/Directory.Build.props | 1 + ...d-support-building-with-mono-runtime.patch | 24 +++++++++ ...d-support-building-with-mono-runtime.patch | 24 +++++++++ ...d-support-building-with-mono-runtime.patch | 51 +++++++++++++++++++ 7 files changed, 110 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index a2831d574559..9ebca97ff908 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,6 +11,7 @@ $(InnerBuildArgs) /p:IncludeNuGetPackageArchive=false $(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false $(InnerBuildArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false + $(InnerBuildArgs) /p:DISABLE_CROSSGEN=true diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 860785575f7a..982fb7f0725c 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -24,6 +24,11 @@ false + false + + true + true + diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index e899d2f808c0..17699c78cb76 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -11,6 +11,7 @@ usage() { echo " --run-smoke-test don't build; run smoke tests" echo " --with-packages use the specified directory of previously-built packages" echo " --with-sdk use the SDK in the specified directory for bootstrapping" + echo " --use-mono-runtime output uses the mono runtime" echo "use -- to send the remaining arguments to MSBuild" echo "" } @@ -65,6 +66,9 @@ while :; do fi shift ;; + --use-mono-runtime) + MSBUILD_ARGUMENTS+=( "/p:SourceBuildUseMonoRuntime=true" ) + ;; --) shift echo "Detected '--': passing remaining parameters '$@' as build.sh arguments." diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e4e3060af7f8..04ab89d11dc9 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -143,6 +143,7 @@ $(StandardSourceBuildArgs) /p:AdditionalSourceBuiltNupkgCacheDir="$(SourceBuiltPackagesPath)" $(StandardSourceBuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)" $(StandardSourceBuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)" + $(StandardSourceBuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) $(ProjectDirectory)\build$(ShellExtension) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch new file mode 100644 index 000000000000..81ee5be269e3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch @@ -0,0 +1,24 @@ +From bdad8007363d3cd6409de7994de21b0f0670b90c Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Wed, 19 Oct 2022 13:01:12 +0200 +Subject: [PATCH] source-build: support building with mono runtime. + +--- + eng/SourceBuild.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 32108e1f..3dfbd5ef 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -55,6 +55,7 @@ + + + $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) ++ $(InnerBuildArgs) /p:CrossgenOutput=false + + + +-- +2.37.3 + diff --git a/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch new file mode 100644 index 000000000000..59b0a332b568 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch @@ -0,0 +1,24 @@ +From c562789d1ad0cab0e924c49c3df16974c81099b9 Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Wed, 19 Oct 2022 13:00:50 +0200 +Subject: [PATCH] source-build: support building with mono runtime. + +--- + eng/SourceBuild.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index c197d8afd..55c1c1d22 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -41,6 +41,7 @@ + $(InnerBuildArgs) /p:EnableNgenOptimization=false + $(InnerBuildArgs) /p:EnablePackageValidation=false + $(InnerBuildArgs) /p:DisableSourceLink=false ++ $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono + + + +-- +2.37.3 + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch new file mode 100644 index 000000000000..449ac6a06f1d --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch @@ -0,0 +1,51 @@ +From e358070323a74a46391567101be4c583680a0df0 Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Wed, 19 Oct 2022 13:00:45 +0200 +Subject: [PATCH] source-build: support building with mono runtime. + +--- + eng/SourceBuild.props | 1 + + src/Layout/redist/targets/BundledSdks.targets | 2 +- + .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 61b9a91..2107a71 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 6f8b0fc..64638ef 100644 +--- a/src/Layout/redist/targets/BundledSdks.targets ++++ b/src/Layout/redist/targets/BundledSdks.targets +@@ -5,6 +5,6 @@ + + + +- ++ + + +diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +index 73a1821..8466fff 100644 +--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props ++++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +@@ -151,7 +151,7 @@ Copyright (c) .NET Foundation. All rights reserved. + + + +- ++ + + + +-- +2.37.3 + From 08ac391b254003838254487e5d947ad6df0fada7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Fri, 21 Oct 2022 11:41:35 +0200 Subject: [PATCH 2/4] Sync with sdk patch. --- ...d-support-building-with-mono-runtime.patch | 297 +++++++++++++++++- 1 file changed, 285 insertions(+), 12 deletions(-) diff --git a/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch index 449ac6a06f1d..82f014fe278c 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch @@ -1,16 +1,33 @@ -From e358070323a74a46391567101be4c583680a0df0 Mon Sep 17 00:00:00 2001 +From 2e9c4d0058bea08e831f802e85262895e55f2ddd Mon Sep 17 00:00:00 2001 From: Tom Deseyn -Date: Wed, 19 Oct 2022 13:00:45 +0200 -Subject: [PATCH] source-build: support building with mono runtime. +Date: Thu, 20 Oct 2022 09:42:59 +0200 +Subject: [PATCH] Make PublishAot an optional feature because Mono does not + support it. --- - eng/SourceBuild.props | 1 + - src/Layout/redist/targets/BundledSdks.targets | 2 +- - .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) + eng/SourceBuild.props | 1 + + src/Layout/redist/targets/BundledSdks.targets | 2 +- + src/Tasks/Common/Resources/Strings.resx | 4 ++++ + src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.de.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.es.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.it.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++ + src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++ + .../targets/Microsoft.NET.Publish.targets | 2 ++ + .../targets/Microsoft.NET.Sdk.props | 4 +++- + .../targets/Microsoft.NET.Sdk.targets | 2 +- + 19 files changed, 77 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 61b9a91..2107a71 100644 +index 61b9a91370..2107a71841 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,6 +8,7 @@ @@ -22,7 +39,7 @@ index 61b9a91..2107a71 100644 diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets -index 6f8b0fc..64638ef 100644 +index 6f8b0fc3b3..64638ef1cf 100644 --- a/src/Layout/redist/targets/BundledSdks.targets +++ b/src/Layout/redist/targets/BundledSdks.targets @@ -5,6 +5,6 @@ @@ -33,19 +50,275 @@ index 6f8b0fc..64638ef 100644 + +diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx +index 1b1faf9abf..dbe96e0e6a 100644 +--- a/src/Tasks/Common/Resources/Strings.resx ++++ b/src/Tasks/Common/Resources/Strings.resx +@@ -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 9cae172df0..d8305fbb5f 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +@@ -12,6 +12,11 @@ + 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 3c5fbc3f09..a3d0427091 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf +@@ -12,6 +12,11 @@ + 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 6121f40203..128c934d4f 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf +@@ -12,6 +12,11 @@ + 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 c8011a2ef6..2efd148191 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +@@ -12,6 +12,11 @@ + 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 2109529788..fa9a5b93e2 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf +@@ -12,6 +12,11 @@ + 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 72200fa0a6..edc1889df4 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +@@ -12,6 +12,11 @@ + 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 ca2c91d5c3..80b254d9c6 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +@@ -12,6 +12,11 @@ + 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 8449f28055..d3c265280e 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +@@ -12,6 +12,11 @@ + 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 8964e711b1..1f68f76bef 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +@@ -12,6 +12,11 @@ + 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 9fb52753f7..78d2acad88 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +@@ -12,6 +12,11 @@ + 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 736c5276b2..21f43d26ee 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +@@ -12,6 +12,11 @@ + 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 b245ebe4ad..88f40b6831 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +@@ -12,6 +12,11 @@ + 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 9568f87fd6..72e3d6bcce 100644 +--- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf ++++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +@@ -12,6 +12,11 @@ + 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 a943e6615b..8593957f3d 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 4311ec0ece..1f80ab9ded 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 +@@ -1175,7 +1175,7 @@ Copyright (c) .NET Foundation. All rights reserved. + + + +- ++ + + + -- 2.37.3 From b3a500a302bcf8ca2260c4565899346b1d8b484e Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 2 Nov 2022 15:20:18 +0100 Subject: [PATCH 3/4] Remove patches. --- ...d-support-building-with-mono-runtime.patch | 24 -- ...d-support-building-with-mono-runtime.patch | 24 -- ...d-support-building-with-mono-runtime.patch | 324 ------------------ 3 files changed, 372 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch deleted file mode 100644 index 81ee5be269e3..000000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0002-source-build-support-building-with-mono-runtime.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bdad8007363d3cd6409de7994de21b0f0670b90c Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 19 Oct 2022 13:01:12 +0200 -Subject: [PATCH] source-build: support building with mono runtime. - ---- - eng/SourceBuild.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 32108e1f..3dfbd5ef 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -55,6 +55,7 @@ - - - $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) -+ $(InnerBuildArgs) /p:CrossgenOutput=false - - - --- -2.37.3 - diff --git a/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch deleted file mode 100644 index 59b0a332b568..000000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-source-build-support-building-with-mono-runtime.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c562789d1ad0cab0e924c49c3df16974c81099b9 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 19 Oct 2022 13:00:50 +0200 -Subject: [PATCH] source-build: support building with mono runtime. - ---- - eng/SourceBuild.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index c197d8afd..55c1c1d22 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -41,6 +41,7 @@ - $(InnerBuildArgs) /p:EnableNgenOptimization=false - $(InnerBuildArgs) /p:EnablePackageValidation=false - $(InnerBuildArgs) /p:DisableSourceLink=false -+ $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono - - - --- -2.37.3 - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch b/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch deleted file mode 100644 index 82f014fe278c..000000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-source-build-support-building-with-mono-runtime.patch +++ /dev/null @@ -1,324 +0,0 @@ -From 2e9c4d0058bea08e831f802e85262895e55f2ddd Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Thu, 20 Oct 2022 09:42:59 +0200 -Subject: [PATCH] Make PublishAot an optional feature because Mono does not - support it. - ---- - eng/SourceBuild.props | 1 + - src/Layout/redist/targets/BundledSdks.targets | 2 +- - src/Tasks/Common/Resources/Strings.resx | 4 ++++ - src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.de.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.es.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.it.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++ - src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++ - .../targets/Microsoft.NET.Publish.targets | 2 ++ - .../targets/Microsoft.NET.Sdk.props | 4 +++- - .../targets/Microsoft.NET.Sdk.targets | 2 +- - 19 files changed, 77 insertions(+), 3 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 61b9a91370..2107a71841 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 6f8b0fc3b3..64638ef1cf 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 1b1faf9abf..dbe96e0e6a 100644 ---- a/src/Tasks/Common/Resources/Strings.resx -+++ b/src/Tasks/Common/Resources/Strings.resx -@@ -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 9cae172df0..d8305fbb5f 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf -@@ -12,6 +12,11 @@ - 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 3c5fbc3f09..a3d0427091 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf -@@ -12,6 +12,11 @@ - 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 6121f40203..128c934d4f 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf -@@ -12,6 +12,11 @@ - 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 c8011a2ef6..2efd148191 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf -@@ -12,6 +12,11 @@ - 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 2109529788..fa9a5b93e2 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf -@@ -12,6 +12,11 @@ - 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 72200fa0a6..edc1889df4 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf -@@ -12,6 +12,11 @@ - 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 ca2c91d5c3..80b254d9c6 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf -@@ -12,6 +12,11 @@ - 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 8449f28055..d3c265280e 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf -@@ -12,6 +12,11 @@ - 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 8964e711b1..1f68f76bef 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf -@@ -12,6 +12,11 @@ - 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 9fb52753f7..78d2acad88 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf -@@ -12,6 +12,11 @@ - 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 736c5276b2..21f43d26ee 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf -@@ -12,6 +12,11 @@ - 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 b245ebe4ad..88f40b6831 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf -@@ -12,6 +12,11 @@ - 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 9568f87fd6..72e3d6bcce 100644 ---- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf -+++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf -@@ -12,6 +12,11 @@ - 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 a943e6615b..8593957f3d 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 4311ec0ece..1f80ab9ded 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 -@@ -1175,7 +1175,7 @@ Copyright (c) .NET Foundation. All rights reserved. - - - -- -+ - - - --- -2.37.3 - From e8113ceec0ff912479d22901233b7513d717d7b7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Tue, 15 Nov 2022 15:55:01 +0100 Subject: [PATCH 4/4] PR feedback. --- src/SourceBuild/tarball/content/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 17699c78cb76..25d5e1d22a60 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -9,9 +9,9 @@ usage() { echo " --online build using online sources" echo " --poison build with poisoning checks" echo " --run-smoke-test don't build; run smoke tests" + echo " --use-mono-runtime output uses the mono runtime" echo " --with-packages use the specified directory of previously-built packages" echo " --with-sdk use the SDK in the specified directory for bootstrapping" - echo " --use-mono-runtime output uses the mono runtime" echo "use -- to send the remaining arguments to MSBuild" echo "" } @@ -46,6 +46,9 @@ while :; do runningSmokeTests=true MSBUILD_ARGUMENTS+=( "/t:RunSmokeTest" ) ;; + --use-mono-runtime) + MSBUILD_ARGUMENTS+=( "/p:SourceBuildUseMonoRuntime=true" ) + ;; --with-packages) CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)" if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then @@ -66,9 +69,6 @@ while :; do fi shift ;; - --use-mono-runtime) - MSBUILD_ARGUMENTS+=( "/p:SourceBuildUseMonoRuntime=true" ) - ;; --) shift echo "Detected '--': passing remaining parameters '$@' as build.sh arguments."