Auto sync2gitlab import of dotnet7.0-7.0.101-1.el8_7.src.rpm
This commit is contained in:
parent
078237800c
commit
6df8b23b14
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/dotnet-arm64-prebuilts-2022-09-17.tar.gz
|
||||
/dotnet-s390x-prebuilts-2022-08-24.tar.gz
|
||||
/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz
|
||||
/dotnet-v7.0.101.tar.gz
|
130
dotnet7.0.spec
130
dotnet7.0.spec
@ -1,4 +1,4 @@
|
||||
%bcond_without bootstrap
|
||||
%bcond_with bootstrap
|
||||
|
||||
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
||||
# change the validity of any given source and the nature of the error (undefined enum), I
|
||||
@ -6,22 +6,21 @@
|
||||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%global host_version 7.0.0-rc.1.22426.10
|
||||
%global runtime_version 7.0.0-rc.1.22426.10
|
||||
%global aspnetcore_runtime_version 7.0.0-rc.1.22427.2
|
||||
%global sdk_version 7.0.100-rc.1.22464.1
|
||||
%global host_version 7.0.1
|
||||
%global runtime_version 7.0.1
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 7.0.101
|
||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||
%global templates_version 7.0.0-rc.1.22427.2
|
||||
%global templates_version %{runtime_version}
|
||||
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||
|
||||
%global host_rpm_version 7.0.0
|
||||
%global runtime_rpm_version 7.0.0
|
||||
%global aspnetcore_runtime_rpm_version 7.0.0
|
||||
%global sdk_rpm_version 7.0.100
|
||||
%global host_rpm_version %{host_version}
|
||||
%global runtime_rpm_version %{runtime_version}
|
||||
%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
|
||||
%global sdk_rpm_version %{sdk_version}
|
||||
|
||||
# upstream can update releases without revving the SDK version so these don't always match
|
||||
#%%global upstream_tag v%%{sdk_version}
|
||||
%global upstream_tag v7.0.100-rc.1.22431.12
|
||||
%global upstream_tag v%{sdk_version}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%global use_bundled_libunwind 0
|
||||
@ -29,39 +28,46 @@
|
||||
%global use_bundled_libunwind 1
|
||||
%endif
|
||||
|
||||
%ifarch aarch64 s390x
|
||||
%ifarch aarch64 ppc64le s390x
|
||||
%global use_bundled_libunwind 1
|
||||
%endif
|
||||
|
||||
%ifarch x86_64
|
||||
%global runtime_arch x64
|
||||
%endif
|
||||
%ifarch aarch64
|
||||
%global runtime_arch arm64
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
%global runtime_arch ppc64le
|
||||
%endif
|
||||
%ifarch s390x
|
||||
%global runtime_arch s390x
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
%global runtime_arch x64
|
||||
%endif
|
||||
|
||||
%global mono_archs s390x ppc64le
|
||||
|
||||
%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
|
||||
|
||||
Name: dotnet7.0
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 0.2.rc1%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: .NET Runtime and SDK
|
||||
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
|
||||
URL: https://github.com/dotnet/
|
||||
|
||||
%if %{with bootstrap}
|
||||
# The source is generated on a Fedora box via:
|
||||
# The source is generated on a RHEL box via:
|
||||
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
||||
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
|
||||
# Generated via ./build-arm64-bootstrap-tarball
|
||||
Source1: dotnet-arm64-prebuilts-2022-09-17.tar.gz
|
||||
Source1: dotnet-arm64-prebuilts-2022-10-12.tar.gz
|
||||
# Generated manually, same pattern as the arm64 tarball
|
||||
Source2: dotnet-s390x-prebuilts-2022-08-24.tar.gz
|
||||
Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
|
||||
# Generated manually, same pattern as the arm64 tarball
|
||||
Source3: dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
||||
%else
|
||||
# The source is generated on a Fedora box via:
|
||||
# The source is generated on a RHEL box via:
|
||||
# ./build-dotnet-tarball %%{upstream_tag}
|
||||
Source0: dotnet-%{upstream_tag}.tar.gz
|
||||
%endif
|
||||
@ -69,13 +75,15 @@ Source0: dotnet-%{upstream_tag}.tar.gz
|
||||
Source10: check-debug-symbols.py
|
||||
Source11: dotnet.sh.in
|
||||
|
||||
Patch1: razor-compiler-apphost.patch
|
||||
# https://github.com/dotnet/runtime/pull/74147
|
||||
Patch2: runtime-74147-no-pgo-with-mono.patch
|
||||
# https://github.com/dotnet/installer/pull/14792
|
||||
Patch1: installer-14792-mono.patch
|
||||
# Disable apphost; there's no net6.0 apphost for ppc64le
|
||||
Patch2: roslyn-analyzers-ppc64le-apphost.patch
|
||||
|
||||
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 x86_64 s390x
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
%else
|
||||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
@ -102,6 +110,9 @@ BuildRequires: libunwind-devel
|
||||
%ifarch aarch64
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
# if the build ever crashes, then having lldb installed might help the
|
||||
# runtime generate a backtrace for the crash
|
||||
BuildRequires: lldb
|
||||
BuildRequires: llvm
|
||||
BuildRequires: lttng-ust-devel
|
||||
BuildRequires: make
|
||||
@ -333,6 +344,20 @@ These are not meant for general use.
|
||||
%prep
|
||||
%if %{without bootstrap}
|
||||
%setup -q -n dotnet-%{upstream_tag}
|
||||
|
||||
# Remove all prebuilts
|
||||
find -iname '*.dll' -type f -delete
|
||||
find -iname '*.so' -type f -delete
|
||||
find -iname '*.tar.gz' -type f -delete
|
||||
find -iname '*.nupkg' -type f -delete
|
||||
find -iname '*.zip' -type f -delete
|
||||
|
||||
rm -rf .dotnet/
|
||||
rm -rf packages/source-built
|
||||
|
||||
mkdir -p packages/archive
|
||||
ln -s %{_libdir}/dotnet/source-built-artifacts/Private.SourceBuilt.Artifacts.*.tar.gz packages/archive/
|
||||
|
||||
%else
|
||||
|
||||
%setup -q -T -b 0 -n dotnet-%{upstream_tag}-x64-bootstrap
|
||||
@ -343,27 +368,36 @@ rm -rf .dotnet
|
||||
%ifarch aarch64
|
||||
tar -x --strip-components=1 -f %{SOURCE1} -C packages/prebuilt
|
||||
%endif
|
||||
%ifarch s390x
|
||||
%ifarch ppc64le
|
||||
tar -x --strip-components=1 -f %{SOURCE2} -C packages/prebuilt
|
||||
%endif
|
||||
%ifarch s390x
|
||||
tar -x --strip-components=1 -f %{SOURCE3} -C packages/prebuilt
|
||||
%endif
|
||||
|
||||
mkdir -p .dotnet
|
||||
tar xf packages/prebuilt/dotnet-sdk*.tar.gz -C .dotnet/
|
||||
rm packages/prebuilt/dotnet-sdk*.tar.gz
|
||||
|
||||
boot_sdk_version=$(ls -1 .dotnet/sdk/)
|
||||
sed -i -E 's|"dotnet": "[^"]+"|"dotnet" : "'$boot_sdk_version'"|' global.json
|
||||
|
||||
%ifarch ppc64le s390x
|
||||
ilasm_version=$(ls packages/prebuilt| grep -i ilasm | tr 'A-Z' 'a-z' | sed -E 's|runtime.linux-'%{runtime_arch}'.microsoft.netcore.ilasm.||' | sed -E 's|.nupkg$||')
|
||||
echo $ilasm_version
|
||||
|
||||
mkdir -p packages-customized-local
|
||||
pushd packages-customized-local
|
||||
tar xf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
|
||||
sed -i -E 's|<MicrosoftNETCoreILAsmVersion>[^<]+</MicrosoftNETCoreILAsmVersion>|<MicrosoftNETCoreILAsmVersion>'$ilasm_version'</MicrosoftNETCoreILAsmVersion>|' PackageVersions.props
|
||||
sed -i -E 's|<MicrosoftNETCoreILDAsmVersion>[^<]+</MicrosoftNETCoreILDAsmVersion>|<MicrosoftNETCoreILDAsmVersion>'$ilasm_version'</MicrosoftNETCoreILDAsmVersion>|' PackageVersions.props
|
||||
tar czf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz *
|
||||
popd
|
||||
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%if %{without bootstrap}
|
||||
# Remove all prebuilts
|
||||
find -iname '*.dll' -type f -delete
|
||||
find -iname '*.so' -type f -delete
|
||||
find -iname '*.tar.gz' -type f -delete
|
||||
find -iname '*.nupkg' -type f -delete
|
||||
find -iname '*.zip' -type f -delete
|
||||
rm -rf .dotnet/
|
||||
rm -rf packages/source-built
|
||||
%endif
|
||||
|
||||
%patch1 -p1
|
||||
@ -434,15 +468,12 @@ export COMPlus_LTTng=0
|
||||
export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
# See https://github.com/dotnet/source-build/issues/2991
|
||||
export DOTNET_NUGET_SIGNATURE_VERIFICATION=false
|
||||
%endif
|
||||
|
||||
VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap}
|
||||
--with-sdk previously-built-dotnet \
|
||||
--with-packages %{_libdir}/dotnet/source-built-artifacts/Private.SourceBuilt.Artifacts.*.tar.gz
|
||||
%endif
|
||||
%ifarch %{mono_archs}
|
||||
--use-mono-runtime \
|
||||
%endif
|
||||
-- \
|
||||
/p:MinimalConsoleLogOutput=false \
|
||||
@ -582,7 +613,6 @@ export COMPlus_LTTng=0
|
||||
%{_libdir}/dotnet/sdk/%{sdk_version}
|
||||
%dir %{_libdir}/dotnet/sdk-manifests
|
||||
%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}
|
||||
%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}-rc.1
|
||||
%{_libdir}/dotnet/metadata
|
||||
%dir %{_libdir}/dotnet/packs
|
||||
|
||||
@ -592,6 +622,22 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 06 2022 Omair Majid <omajid@redhat.com> - 7.0.101-1
|
||||
- Update to .NET SDK 7.0.101 and Runtime 7.0.1
|
||||
- Resolves: RHBZ#2150151
|
||||
|
||||
* Wed Nov 02 2022 Omair Majid <omajid@redhat.com> - 7.0.100-1
|
||||
- Update to .NET SDK 7.0.100 and Runtime 7.0.0
|
||||
- Resolves: RHBZ#2137943
|
||||
|
||||
* Mon Oct 24 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.4.rc2
|
||||
- Enable ppc64le builds
|
||||
- Related: RHBZ#2134642
|
||||
|
||||
* Thu Oct 13 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.3.rc2
|
||||
- Update to .NET 7 RC 2
|
||||
- Resolves: RHBZ#2134642
|
||||
|
||||
* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.2.rc1
|
||||
- Update to .NET 7 RC 1
|
||||
- Enable s390x builds
|
346
installer-14792-mono.patch
Normal file
346
installer-14792-mono.patch
Normal file
@ -0,0 +1,346 @@
|
||||
Please note that the paths in this patch have been manually modified so
|
||||
we can apply it against an already-built tarball.
|
||||
|
||||
From 9a7d07ab5a163b75a7b82cf8883d32553f34dcdb Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Wed, 19 Oct 2022 15:21:40 +0200
|
||||
Subject: [PATCH] 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/src/sdk/eng/SourceBuild.props b/src/sdk/eng/SourceBuild.props
|
||||
index 61b9a913708..2107a718419 100644
|
||||
--- a/src/sdk/eng/SourceBuild.props
|
||||
+++ b/src/sdk/eng/SourceBuild.props
|
||||
@@ -8,6 +8,7 @@
|
||||
<PropertyGroup>
|
||||
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf"</InnerBuildArgs>
|
||||
<InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
|
||||
+ <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:NativeAotSupported=false</InnerBuildArgs>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
diff --git a/src/sdk/src/Layout/redist/targets/BundledSdks.targets b/src/sdk/src/Layout/redist/targets/BundledSdks.targets
|
||||
index 6f8b0fc3b33..64638ef1cff 100644
|
||||
--- a/src/sdk/src/Layout/redist/targets/BundledSdks.targets
|
||||
+++ b/src/sdk/src/Layout/redist/targets/BundledSdks.targets
|
||||
@@ -5,6 +5,6 @@
|
||||
<BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
|
||||
<BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
|
||||
<BundledSdk Include="Microsoft.NET.ILLink.Tasks" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
|
||||
- <BundledSdk Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerPackageVersion)" />
|
||||
+ <BundledSdk Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerPackageVersion)" Condition="'$(NativeAotSupported)' != 'false'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/Strings.resx b/src/sdk/src/Tasks/Common/Resources/Strings.resx
|
||||
index a347c736df5..426cb6aa96d 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/Strings.resx
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/Strings.resx
|
||||
@@ -875,4 +875,8 @@ You may need to build the project on another operating system or architecture, o
|
||||
<value>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</value>
|
||||
<comment>{StrBegin="NETSDK1192: "}</comment>
|
||||
</data>
|
||||
+ <data name="AotNotSupported" xml:space="preserve">
|
||||
+ <value>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</value>
|
||||
+ <comment>{StrBegin="NETSDK1193: "}</comment>
|
||||
+ </data>
|
||||
</root>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
|
||||
index e477f7a489b..c75990f94e2 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: Konfigurační soubor aplikace musí obsahovat kořenový element konfigurace.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.de.xlf
|
||||
index d8cd9725269..2e427931dd1 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.de.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.de.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: Die Anwendungskonfigurationsdatei muss das Stammkonfigurationselement enthalten.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.es.xlf
|
||||
index 4c61e20b937..cb654c521fb 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.es.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.es.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: El archivo de configuración de la aplicación debe tener el elemento de configuración raíz.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
|
||||
index dfbb0391549..a97af754880 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: Le fichier de configuration de l'application doit avoir un élément de configuration racine.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.it.xlf
|
||||
index a768517271c..70fe2939526 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.it.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.it.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: il file di configurazione dell'applicazione deve avere un elemento di configurazione radice.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
|
||||
index c3713a3bb6f..42ba79f1034 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">NETSDK1183: Ahead Of Time コンパイル用にアセンブリを最適化できません: 有効なランタイム パッケージが見つかりませんでした。PublishAot プロパティを false に設定するか、公開時に、サポートされているランタイム識別子を使用してください。.NET 7 以降を対象とする場合は、必ず PublishAot プロパティを true に設定してパッケージを復元してください。</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: アプリケーション構成ファイルには、ルート構成要素が必要です。</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
|
||||
index 86d77d024ad..f9695e37529 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">NETSDK1183: Ahead of Time 컴파일을 위해 어셈블리를 최적화할 수 없습니다. 유효한 런타임 패키지를 찾을 수 없습니다. PublishAot 속성을 false로 설정하거나 게시할 때 지원되는 런타임 식별자를 사용하세요. .NET 7 이상을 대상으로 하는 경우 PublishAot 속성이 true로 설정된 패키지를 복원해야 합니다.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: 애플리케이션 구성 파일에는 루트 구성 요소가 있어야 합니다.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
|
||||
index b954c4f64f5..0594cfc5bad 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: Plik konfiguracji aplikacji musi mieć główny element konfiguracji.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
|
||||
index 4153425cfce..ae701f4dc3b 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: o arquivo de configuração do aplicativo deve ter um elemento de configuração raiz.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
|
||||
index e66e13cd417..1780c0eb89b 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">NETSDK1183: не удалось оптимизировать сборки для компиляции Ahead Of Time: не найден допустимый пакет среды выполнения. Задайте для свойства PublishAot значение false либо используйте поддерживаемый идентификатор среды выполнения при публикации. При выборе .NET 7 или более поздней версии в качестве цели восстановите пакеты со свойством PublishAot со значением true.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: В файле конфигурации приложения должен присутствовать корневой элемент конфигурации.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
|
||||
index 4121fe024d6..d4ec2bbfea3 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">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.</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: Uygulama yapılandırma dosyasının kök yapılandırma öğesi olmalıdır.</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
|
||||
index 5bd5617ccba..77323667f98 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">NETSDK1183: 无法优化程序集以实现提前编译: 找不到有效的运行时包。将 PublishAot 属性设置为 false,或在发布时使用支持的运行时标识符。面向 .NET 7 或更高版本时,请确保还原将 PublishAot 属性设置为 true 的包。</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: 应用程序配置文件必须具有根配置元素。</target>
|
||||
diff --git a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
|
||||
index c2e6be8b9be..ae573c7ed8b 100644
|
||||
--- a/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
|
||||
+++ b/src/sdk/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
|
||||
@@ -12,6 +12,11 @@
|
||||
<target state="translated">NETSDK1183: 無法為提前編譯最佳化組件: 找不到有效的執行階段套件。請將 PublishAot 屬性設為 false,或在發佈時使用支援的執行階段識別碼。以 .NET 7 或更高版本為目標時,請務必還原套件,將 PublishAot 屬性設為 true。</target>
|
||||
<note>{StrBegin="NETSDK1183: "}</note>
|
||||
</trans-unit>
|
||||
+ <trans-unit id="AotNotSupported">
|
||||
+ <source>NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</source>
|
||||
+ <target state="new">NETSDK1193: The SDK does not support Ahead of time compilation. Set the PublishAot property to false.</target>
|
||||
+ <note>{StrBegin="NETSDK1193: "}</note>
|
||||
+ </trans-unit>
|
||||
<trans-unit id="AppConfigRequiresRootConfiguration">
|
||||
<source>NETSDK1070: The application configuration file must have root configuration element.</source>
|
||||
<target state="translated">NETSDK1070: 應用程式組態檔必須有根組態元素。</target>
|
||||
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
index 84b21ee0dd8..72d10f518af 100644
|
||||
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
@@ -178,6 +178,9 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
|
||||
FormatArguments="PublishAot"/>
|
||||
|
||||
+ <NETSdkError Condition="'$(PublishAot)' == 'true' and '$(PublishAotSupported)' != 'true'"
|
||||
+ ResourceName="AotNotSupported" />
|
||||
+
|
||||
<!-- End of implicit RID resolver checks.-->
|
||||
<NETSdkError Condition="'$(SelfContained)' == 'true' and '$(UseAppHost)' != 'true' and '$(_RuntimeIdentifierUsesAppHost)' == 'true'"
|
||||
ResourceName="CannotUseSelfContainedWithoutAppHost" />
|
||||
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
|
||||
index 73a182102d1..b7eee4dfe3d 100644
|
||||
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
|
||||
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
|
||||
@@ -116,6 +116,8 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
<MSBuildCopyContentTransitively Condition="'$(MSBuildCopyContentTransitively)' == ''">true</MSBuildCopyContentTransitively>
|
||||
<ResolveAssemblyReferenceOutputUnresolvedAssemblyConflicts Condition="'$(ResolveAssemblyReferenceOutputUnresolvedAssemblyConflicts)' == ''">true</ResolveAssemblyReferenceOutputUnresolvedAssemblyConflicts>
|
||||
|
||||
+ <PublishAotSupported>false</PublishAotSupported>
|
||||
+ <PublishAotSupported Condition="Exists('$(MSBuildThisFileDirectory)../../Microsoft.DotNet.ILCompiler')">true</PublishAotSupported>
|
||||
<!-- Uncomment this once https://github.com/Microsoft/visualfsharp/issues/3207 gets fixed -->
|
||||
<!-- <WarningsAsErrors>$(WarningsAsErrors);NU1605</WarningsAsErrors> -->
|
||||
</PropertyGroup>
|
||||
@@ -151,7 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.props" Condition="'$(MSBuildProjectExtension)' == '.vbproj'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.FSharp.props" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
|
||||
- <Import Project="Sdk.props" Sdk="Microsoft.DotNet.ILCompiler" />
|
||||
+ <Import Project="Sdk.props" Sdk="Microsoft.DotNet.ILCompiler" Condition="'$(PublishAotSupported)' == 'true'" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.ILLink.Tasks" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.props" />
|
||||
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
|
||||
index 4311ec0ecea..1f80ab9ded0 100644
|
||||
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
|
||||
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
|
||||
@@ -1175,7 +1175,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.targets" Condition="'$(Language)' == 'C#'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.targets" Condition="'$(Language)' == 'VB'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.FSharp.targets" Condition="'$(Language)' == 'F#'" />
|
||||
- <Import Project="$(ILCompilerTargetsPath)" Condition="'$(PublishAot)' == 'true'"/>
|
||||
+ <Import Project="$(ILCompilerTargetsPath)" Condition="'$(PublishAot)' == 'true' and '$(PublishAotSupported)' == 'true'"/>
|
||||
<Import Project="$(ILLinkTargetsPath)" Condition="'$(Language)' != 'C++'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Analyzers.targets" Condition="'$(Language)' == 'C#' or '$(Language)' == 'VB'" />
|
||||
|
||||
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
|
||||
index a943e6615bf..8593957f3d6 100644
|
||||
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
|
||||
+++ b/src/sdk/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" />
|
||||
+ <NETSdkError Condition="'$(PublishAot)' == 'true' and '$(PublishAotSupported)' != 'true'"
|
||||
+ ResourceName="AotNotSupported" />
|
||||
|
||||
<!-- Enable warning for trying to use PublishRelease or PackRelease with a solution if env-var is not set.-->
|
||||
<NETSdkWarning Condition="'$(PublishRelease)' != '' and '$(SolutionExt)' == '.sln' and '$(DOTNET_CLI_ENABLE_PUBLISH_RELEASE_FOR_SOLUTIONS)' == ''"
|
||||
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
index 72d10f518af..84b21ee0dd8 100644
|
||||
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
@@ -178,9 +178,6 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
|
||||
FormatArguments="PublishAot"/>
|
||||
|
||||
- <NETSdkError Condition="'$(PublishAot)' == 'true' and '$(PublishAotSupported)' != 'true'"
|
||||
- ResourceName="AotNotSupported" />
|
||||
-
|
||||
<!-- End of implicit RID resolver checks.-->
|
||||
<NETSdkError Condition="'$(SelfContained)' == 'true' and '$(UseAppHost)' != 'true' and '$(_RuntimeIdentifierUsesAppHost)' == 'true'"
|
||||
ResourceName="CannotUseSelfContainedWithoutAppHost" />
|
@ -1,26 +0,0 @@
|
||||
Don't use an apphost for RazorSyntaxGenerator
|
||||
|
||||
The RazorSyntaxGenerator tool is excluded from source-build, but the build
|
||||
system tries to find the apphost matching the TFM anyway. This project targets
|
||||
netcoreapp3.1, so the build fails on s390x because the no apphost exists for
|
||||
that on s390x.
|
||||
--- a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
|
||||
+++ a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
|
||||
@@ -10,6 +10,7 @@
|
||||
<!-- No need to track public APIs of this tool. -->
|
||||
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
|
||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
+ <UseAppHost>false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
--- a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
|
||||
+++ a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
|
||||
@@ -7,6 +7,7 @@
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
<IsPackable>false</IsPackable>
|
||||
+ <UseAppHost>false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
12
roslyn-analyzers-ppc64le-apphost.patch
Normal file
12
roslyn-analyzers-ppc64le-apphost.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj
|
||||
index 044a2aba4..b3f8f2611 100644
|
||||
--- a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj
|
||||
+++ b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj
|
||||
@@ -4,6 +4,7 @@
|
||||
<LangVersion>preview</LangVersion>
|
||||
<Nullable>disable</Nullable>
|
||||
<OutputType>Exe</OutputType>
|
||||
+ <UseAppHost>false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<NonShipping>true</NonShipping>
|
@ -1,27 +0,0 @@
|
||||
From 98c1b3a803cb01232ee40bb4192679fcab3232e7 Mon Sep 17 00:00:00 2001
|
||||
From: Jo Shields <directhex@apebox.org>
|
||||
Date: Thu, 18 Aug 2022 09:08:36 -0400
|
||||
Subject: [PATCH] Don't try to build PGO tools on platforms with no CoreCLR
|
||||
port.
|
||||
|
||||
Closes: #74102
|
||||
---
|
||||
eng/Subsets.props | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/runtime/eng/Subsets.props b/src/runtime/eng/Subsets.props
|
||||
index 911c24dbde6..1e8e5801e57 100644
|
||||
--- a/src/runtime/eng/Subsets.props
|
||||
+++ b/src/runtime/eng/Subsets.props
|
||||
@@ -62,7 +62,8 @@
|
||||
<DefaultMonoSubsets Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(MonoAOTLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
|
||||
<DefaultMonoSubsets Condition="'$(TargetOS)' == 'Browser'">$(DefaultMonoSubsets)mono.wasmruntime+</DefaultMonoSubsets>
|
||||
<DefaultMonoSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">$(DefaultMonoSubsets)mono.aotcross+</DefaultMonoSubsets>
|
||||
- <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+mono.tools+</DefaultMonoSubsets>
|
||||
+ <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+</DefaultMonoSubsets>
|
||||
+ <DefaultMonoSubsets Condition="'$(PrimaryRuntimeFlavor)' != 'Mono'">$(DefaultMonoSubsets)mono.tools+</DefaultMonoSubsets>
|
||||
<DefaultMonoSubsets Condition="'$(TargetsMobile)' != 'true'">$(DefaultMonoSubsets)host.native+</DefaultMonoSubsets>
|
||||
|
||||
<DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
|
||||
--
|
||||
2.37.2
|
4
sources
4
sources
@ -1,3 +1 @@
|
||||
SHA512 (dotnet-arm64-prebuilts-2022-09-17.tar.gz) = 2cb96760450428f952259ed40fb4cee080e4ce7f0c6ce38c3d653a943b43106e598c8ea7c46fd8d269b34f955e1d452757dbc2ebe4b28e38572960ac346c89aa
|
||||
SHA512 (dotnet-s390x-prebuilts-2022-08-24.tar.gz) = b0312750701fdcf450e32c71155abbbb77d74d6709335e9b043b0acd3284c4d15e23ec74aa751f920966ed2d6f9e1144611e18b6a23c6a3cb5413766ca0d1a5f
|
||||
SHA512 (dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz) = 5614a934759254899fdebada43aa01c6873fd8f44878cd0c8620253f40595ddc60da510e7f13e22374d4f54a25eb0139bc7844d63307a8e8516fff32cb8de6c2
|
||||
SHA512 (dotnet-v7.0.101.tar.gz) = 049af4688ca706a2e17630bbe5d9dd72589fb257a27a9e7bedb391be6acdce9f109a5ccab4d6afeb77ad5559c9919fdbdda8586397040ee424e6c4570495da69
|
Loading…
Reference in New Issue
Block a user