From ba14e1d6d8eca6c5efbb03dd04332c01ee5488da Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 23 Jun 2020 17:12:32 -0700 Subject: [PATCH 001/185] Start creating runtime, apphost, and targeting packs using the new SDK in the NewSFX subset. --- NuGet.config | 2 + eng/Subsets.props | 8 +- global.json | 5 +- .../pkg/newsfx/Directory.Build.props | 24 ++ .../Directory.Build.props | 312 ++++++++++++++++++ .../Directory.Build.targets | 63 ++++ .../Microsoft.NETCore.App.Host.sfxproj | 59 ++++ .../Microsoft.NETCore.App.Ref.sfxproj | 17 + .../Microsoft.NETCore.App.Runtime.sfxproj | 81 +++++ 9 files changed, 568 insertions(+), 3 deletions(-) create mode 100644 src/installer/pkg/newsfx/Directory.Build.props create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj diff --git a/NuGet.config b/NuGet.config index 13929bbcd87a42..d3c4daf0e465d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,8 @@ + + diff --git a/eng/Subsets.props b/eng/Subsets.props index 7cc66a92e1f0d6..7b8dd01860686a 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -105,12 +105,13 @@ - + + @@ -238,6 +239,11 @@ + + + + + diff --git a/global.json b/global.json index cb5531f84f5feb..585185f6b21bda 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "5.0.100-preview.6.20310.4", + "version": "5.0.100-preview.7.20323.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "5.0.100-preview.6.20310.4" + "dotnet": "5.0.100-preview.7.20323.2" }, "native-tools": { "cmake": "3.14.5", @@ -15,6 +15,7 @@ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20309.1", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20309.1", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20309.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20309.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18", diff --git a/src/installer/pkg/newsfx/Directory.Build.props b/src/installer/pkg/newsfx/Directory.Build.props new file mode 100644 index 00000000000000..2f57a68248c713 --- /dev/null +++ b/src/installer/pkg/newsfx/Directory.Build.props @@ -0,0 +1,24 @@ + + + + + $(NetCoreAppCurrent) + + + $(RepoRoot)THIRD-PARTY-NOTICES.TXT + + https://go.microsoft.com/fwlink/?LinkID=799417 + https://dot.net + $(RepoRoot)LICENSE.TXT + true + true + + + + + + D:\source\arcade\artifacts\bin\Microsoft.DotNet.SharedFramework.Sdk\Debug\netcoreapp2.1\publish\ + D:\source\arcade\src\Microsoft.DotNet.SharedFramework.Sdk\targets\ + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props new file mode 100644 index 00000000000000..dc7388337b24b7 --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -0,0 +1,312 @@ + + + true + + + + + + Microsoft.NETCore.App + .NET Runtime + Microsoft .NET Runtime + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_pastShimFiles Include="System.Globalization.Native.dylib" /> + <_pastShimFiles Include="System.Globalization.Native.so" /> + <_pastShimFiles Include="System.IO.Compression.Native.a" /> + <_pastShimFiles Include="System.IO.Compression.Native.dylib" /> + <_pastShimFiles Include="System.IO.Compression.Native.so" /> + <_pastShimFiles Include="System.Native.a" /> + <_pastShimFiles Include="System.Native.dylib" /> + <_pastShimFiles Include="System.Native.so" /> + <_pastShimFiles Include="System.Net.Http.Native.a" /> + <_pastShimFiles Include="System.Net.Http.Native.dylib" /> + <_pastShimFiles Include="System.Net.Http.Native.so" /> + <_pastShimFiles Include="System.Net.Security.Native.a" /> + <_pastShimFiles Include="System.Net.Security.Native.dylib" /> + <_pastShimFiles Include="System.Net.Security.Native.so" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> + + + + + true + 10.0.19041.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets new file mode 100644 index 00000000000000..2479e4ffb8c900 --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets @@ -0,0 +1,63 @@ + + + + + + + + + + <_hostArch>$(TargetArchitecture) + <_longNameTargetArch>$(TargetArchitecture) + <_hostArch Condition="'$(_hostArch)' == 'x64'">amd64 + <_longNameTargetArch Condition="'$(_longNameTargetArch)' == 'x64'">amd64 + + + <_hostArch>x86 + + + <_hostArch>amd64 + + + <_hostArch>amd64 + + + + + + + + + + + + + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen'" /> + + + + + + + + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj new file mode 100644 index 00000000000000..0428aeb46930bb --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -0,0 +1,59 @@ + + + + + AppHostPack + true + dotnet-apphost-pack + NetCore.AppHostPack + + + + + + + + + + + + + + + + + + + + + + <_SymbolFiles Condition="'$(TargetOS)' == 'Windows_NT'" + Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')" + IsSymbolFile="true" /> + <_SymbolFiles Condition="'$(TargetOS)' != 'Windows_NT'" + Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolFileExtension)')" + IsSymbolFile="true" /> + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj new file mode 100644 index 00000000000000..2e13fc1b269bfe --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj @@ -0,0 +1,17 @@ + + + + + TargetingPack + true + dotnet-targeting-pack + NetCore.TargetingPack + + + + + + + + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj new file mode 100644 index 00000000000000..894a14c604afab --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -0,0 +1,81 @@ + + + + + RuntimePack + dotnet-runtime + NetCore.SharedFramework + true + + AddRuntimeFilesToPackage; + AddFrameworkFilesToPackage + + true + false + + false + + + + Mono + + + Mono.LLVM + + + Mono.LLVM.AOT + + + $(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix) + + + + + + + + + + runtimes/$(PackageRID)/native + + + + tools + + + + + + + runtimes/$(PackageRID)/native/cross + + + runtimes/$(PackageRID)/native/include/%(RecursiveDir) + + + + runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + + + + + + + + + + + From 6802ad1e2c6b4b285f47c27e7bc2d3c8cbc78ec1 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 24 Jun 2020 14:47:51 -0700 Subject: [PATCH 002/185] Fix generation of runtime package, runtime symbols package, and host symbols package. --- eng/liveBuilds.targets | 7 +-- .../Directory.Build.targets | 26 --------- .../Microsoft.NETCore.App.Host.sfxproj | 7 ++- .../Microsoft.NETCore.App.Runtime.sfxproj | 54 +++++++++++++------ 4 files changed, 48 insertions(+), 46 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 75edb9846cf0d5..1cc716775fdec4 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -113,11 +113,11 @@ Include=" $(CoreCLRSharedFrameworkDir)PDB/*.pdb; $(CoreCLRSharedFrameworkDir)PDB/*.dbg; - $(CoreCLRSharedFrameworkDir)PDB/*.dwarf" /> + $(CoreCLRSharedFrameworkDir)PDB/*.dwarf" IsNative="true" /> + Include="$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.pdb'))" /> + Include="$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.ni.pdb'))" /> diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets index 2479e4ffb8c900..6bf5bb76724f40 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets @@ -34,30 +34,4 @@ - - - - - <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) - <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll - <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) - - - - <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'" /> - <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'" /> - <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen'" /> - <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen'" /> - - - - - - - - diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj index 0428aeb46930bb..13f280a5f95b1b 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -29,13 +29,16 @@ + <_SymbolFiles Condition="'$(TargetOS)' == 'Windows_NT'" Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')" - IsSymbolFile="true" /> + IsSymbolFile="true" + IsNative="true" /> <_SymbolFiles Condition="'$(TargetOS)' != 'Windows_NT'" Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolFileExtension)')" - IsSymbolFile="true" /> + IsSymbolFile="true" + IsNative="true" /> diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 894a14c604afab..1b67803b4068e1 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -1,5 +1,6 @@ - - + + + RuntimePack @@ -35,47 +36,70 @@ - - runtimes/$(PackageRID)/native + + runtimes/$(RuntimeIdentifier)/native tools - - - - runtimes/$(PackageRID)/native/cross + runtimes/$(RuntimeIdentifier)/native/cross - runtimes/$(PackageRID)/native/include/%(RecursiveDir) + runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir) runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native - + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - + - - + + + + + + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + + + + + + + + From a36a296f5563fd5de3c952d2b93241d8eeaf9fd2 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 24 Jun 2020 15:18:54 -0700 Subject: [PATCH 003/185] Correcly include hosting files and DIA in the shared framework archives and packages --- .../Directory.Build.props | 38 +++++++++++++++++++ .../Directory.Build.targets | 28 -------------- .../Microsoft.NETCore.App.Runtime.sfxproj | 25 ++++++++---- 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index dc7388337b24b7..d135611e736cb3 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -70,6 +70,7 @@ true 10.0.19041.1 + 14.12.25830.2 @@ -308,5 +309,42 @@ + + + + + + + + + + + + + + + + + + + <_hostArch>$(TargetArchitecture) + <_longNameTargetArch>$(TargetArchitecture) + <_hostArch Condition="'$(_hostArch)' == 'x64'">amd64 + <_longNameTargetArch Condition="'$(_longNameTargetArch)' == 'x64'">amd64 + + + <_hostArch>x86 + + + <_hostArch>amd64 + + + <_hostArch>amd64 + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets index 6bf5bb76724f40..58c64221d7fcac 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets @@ -1,32 +1,4 @@ - - - - - - - - - <_hostArch>$(TargetArchitecture) - <_longNameTargetArch>$(TargetArchitecture) - <_hostArch Condition="'$(_hostArch)' == 'x64'">amd64 - <_longNameTargetArch Condition="'$(_longNameTargetArch)' == 'x64'">amd64 - - - <_hostArch>x86 - - - <_hostArch>amd64 - - - <_hostArch>amd64 - - diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 1b67803b4068e1..6ee55f58c6f6f8 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -4,7 +4,9 @@ RuntimePack - dotnet-runtime + dotnet-runtime-internal + dotnet-runtime + dotnet-runtime-symbols NetCore.SharedFramework true @@ -34,6 +36,11 @@ + + + + + @@ -75,16 +82,20 @@ + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + + + - - <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) - <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll - <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) - - <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> From c6f72c7a2b3ec8cea3637c69978642f20f3b5f43 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 24 Jun 2020 15:23:30 -0700 Subject: [PATCH 004/185] Include PackageOverrides.txt in the ref pack. --- .../Directory.Build.props | 4 + .../PackageOverrides.txt | 164 ++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index d135611e736cb3..0c04b00d72a4b7 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -12,6 +12,10 @@ true + + + + diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt b/src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt new file mode 100644 index 00000000000000..c4c594f90f86d7 --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt @@ -0,0 +1,164 @@ +Microsoft.CSharp|4.4.0 +Microsoft.Win32.Primitives|4.3.0 +Microsoft.Win32.Registry|4.4.0 +runtime.debian.8-x64.runtime.native.System|4.3.0 +runtime.debian.8-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.debian.8-x64.runtime.native.System.Net.Http|4.3.0 +runtime.debian.8-x64.runtime.native.System.Net.Security|4.3.0 +runtime.debian.8-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.fedora.23-x64.runtime.native.System|4.3.0 +runtime.fedora.23-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.fedora.23-x64.runtime.native.System.Net.Http|4.3.0 +runtime.fedora.23-x64.runtime.native.System.Net.Security|4.3.0 +runtime.fedora.23-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.fedora.24-x64.runtime.native.System|4.3.0 +runtime.fedora.24-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.fedora.24-x64.runtime.native.System.Net.Http|4.3.0 +runtime.fedora.24-x64.runtime.native.System.Net.Security|4.3.0 +runtime.fedora.24-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System.Net.Http|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System.Net.Security|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System.Net.Http|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System.Net.Security|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.osx.10.10-x64.runtime.native.System|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.Net.Http|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.Net.Security|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple|4.3.0 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.rhel.7-x64.runtime.native.System|4.3.0 +runtime.rhel.7-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.rhel.7-x64.runtime.native.System.Net.Http|4.3.0 +runtime.rhel.7-x64.runtime.native.System.Net.Security|4.3.0 +runtime.rhel.7-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography|4.3.0 +runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 +System.AppContext|4.3.0 +System.Buffers|4.4.0 +System.Collections|4.3.0 +System.Collections.Concurrent|4.3.0 +System.Collections.Immutable|1.4.0 +System.Collections.NonGeneric|4.3.0 +System.Collections.Specialized|4.3.0 +System.ComponentModel|4.3.0 +System.ComponentModel.EventBasedAsync|4.3.0 +System.ComponentModel.Primitives|4.3.0 +System.ComponentModel.TypeConverter|4.3.0 +System.Console|4.3.0 +System.Data.Common|4.3.0 +System.Diagnostics.Contracts|4.3.0 +System.Diagnostics.Debug|4.3.0 +System.Diagnostics.DiagnosticSource|4.4.0 +System.Diagnostics.FileVersionInfo|4.3.0 +System.Diagnostics.Process|4.3.0 +System.Diagnostics.StackTrace|4.3.0 +System.Diagnostics.TextWriterTraceListener|4.3.0 +System.Diagnostics.Tools|4.3.0 +System.Diagnostics.TraceSource|4.3.0 +System.Diagnostics.Tracing|4.3.0 +System.Dynamic.Runtime|4.3.0 +System.Globalization|4.3.0 +System.Globalization.Calendars|4.3.0 +System.Globalization.Extensions|4.3.0 +System.IO|4.3.0 +System.IO.Compression|4.3.0 +System.IO.Compression.ZipFile|4.3.0 +System.IO.FileSystem|4.3.0 +System.IO.FileSystem.AccessControl|4.4.0 +System.IO.FileSystem.DriveInfo|4.3.0 +System.IO.FileSystem.Primitives|4.3.0 +System.IO.FileSystem.Watcher|4.3.0 +System.IO.IsolatedStorage|4.3.0 +System.IO.MemoryMappedFiles|4.3.0 +System.IO.Pipes|4.3.0 +System.IO.UnmanagedMemoryStream|4.3.0 +System.Linq|4.3.0 +System.Linq.Expressions|4.3.0 +System.Linq.Queryable|4.3.0 +System.Net.Http|4.3.0 +System.Net.NameResolution|4.3.0 +System.Net.Primitives|4.3.0 +System.Net.Requests|4.3.0 +System.Net.Security|4.3.0 +System.Net.Sockets|4.3.0 +System.Net.WebHeaderCollection|4.3.0 +System.ObjectModel|4.3.0 +System.Private.DataContractSerialization|4.3.0 +System.Reflection|4.3.0 +System.Reflection.Emit|4.3.0 +System.Reflection.Emit.ILGeneration|4.3.0 +System.Reflection.Emit.Lightweight|4.3.0 +System.Reflection.Extensions|4.3.0 +System.Reflection.Metadata|1.5.0 +System.Reflection.Primitives|4.3.0 +System.Reflection.TypeExtensions|4.3.0 +System.Resources.ResourceManager|4.3.0 +System.Runtime|4.3.0 +System.Runtime.Extensions|4.3.0 +System.Runtime.Handles|4.3.0 +System.Runtime.InteropServices|4.3.0 +System.Runtime.InteropServices.RuntimeInformation|4.3.0 +System.Runtime.Loader|4.3.0 +System.Runtime.Numerics|4.3.0 +System.Runtime.Serialization.Formatters|4.3.0 +System.Runtime.Serialization.Json|4.3.0 +System.Runtime.Serialization.Primitives|4.3.0 +System.Security.AccessControl|4.4.0 +System.Security.Claims|4.3.0 +System.Security.Cryptography.Algorithms|4.3.0 +System.Security.Cryptography.Cng|4.4.0 +System.Security.Cryptography.Csp|4.3.0 +System.Security.Cryptography.Encoding|4.3.0 +System.Security.Cryptography.OpenSsl|4.4.0 +System.Security.Cryptography.Primitives|4.3.0 +System.Security.Cryptography.X509Certificates|4.3.0 +System.Security.Cryptography.Xml|4.4.0 +System.Security.Principal|4.3.0 +System.Security.Principal.Windows|4.4.0 +System.Text.Encoding|4.3.0 +System.Text.Encoding.Extensions|4.3.0 +System.Text.RegularExpressions|4.3.0 +System.Threading|4.3.0 +System.Threading.Overlapped|4.3.0 +System.Threading.Tasks|4.3.0 +System.Threading.Tasks.Extensions|4.3.0 +System.Threading.Tasks.Parallel|4.3.0 +System.Threading.Thread|4.3.0 +System.Threading.ThreadPool|4.3.0 +System.Threading.Timer|4.3.0 +System.ValueTuple|4.3.0 +System.Xml.ReaderWriter|4.3.0 +System.Xml.XDocument|4.3.0 +System.Xml.XmlDocument|4.3.0 +System.Xml.XmlSerializer|4.3.0 +System.Xml.XPath|4.3.0 +System.Xml.XPath.XDocument|4.3.0 From 8757c5038d6e06331f08fc00d0021b9b7fd91e51 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 24 Jun 2020 15:29:49 -0700 Subject: [PATCH 005/185] Fix product brand prefix. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index 0c04b00d72a4b7..a890d0f9c38196 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -8,7 +8,7 @@ Microsoft.NETCore.App .NET Runtime - Microsoft .NET Runtime + Microsoft .NET true From cbd46d2c9c35c7e501fda10e79412af8c32d9c1d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 09:51:29 -0700 Subject: [PATCH 006/185] Add the shared host installer. --- .../pkg/newsfx/Directory.Build.props | 4 ++ .../Directory.Build.props | 5 -- .../Microsoft.NETCore.App.Runtime.sfxproj | 3 + .../Microsoft.NETCore.DotNetHost.proj | 55 +++++++++++++++++++ src/installer/pkg/newsfx/installers/host.wxs | 52 ++++++++++++++++++ 5 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj create mode 100644 src/installer/pkg/newsfx/installers/host.wxs diff --git a/src/installer/pkg/newsfx/Directory.Build.props b/src/installer/pkg/newsfx/Directory.Build.props index 2f57a68248c713..7f03fc5ee042d0 100644 --- a/src/installer/pkg/newsfx/Directory.Build.props +++ b/src/installer/pkg/newsfx/Directory.Build.props @@ -1,4 +1,7 @@ + + true + @@ -11,6 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=799417 https://dot.net $(RepoRoot)LICENSE.TXT + Microsoft .NET true true diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index a890d0f9c38196..0dd75ec0b067c5 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -1,14 +1,9 @@ - - true - - Microsoft.NETCore.App .NET Runtime - Microsoft .NET true diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 6ee55f58c6f6f8..b330f351996dc9 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -17,6 +17,9 @@ false false + + true + true diff --git a/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj b/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj new file mode 100644 index 00000000000000..69982887e4e2dd --- /dev/null +++ b/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj @@ -0,0 +1,55 @@ + + + + + true + dotnet-host + Host + ToolPack + NetCore.SharedHost + true + true + sharedhost + Dotnet_CLI_SharedHost + HostSrc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/newsfx/installers/host.wxs b/src/installer/pkg/newsfx/installers/host.wxs new file mode 100644 index 00000000000000..773246beb70f1a --- /dev/null +++ b/src/installer/pkg/newsfx/installers/host.wxs @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From db705702832fd1c0cbbe669feb2dcc3975050cde Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 10:59:29 -0700 Subject: [PATCH 007/185] Add the hostfxr build and clean up MacOS building. --- .../Microsoft.NETCore.App.Runtime.sfxproj | 2 +- .../Microsoft.NETCore.DotNetHost.proj | 9 ++++- .../Microsoft.NETCore.DotNetHostResolver.proj | 39 +++++++++++++++++++ .../installers/osx_scripts/host/postinstall | 19 +++++++++ .../osx_scripts/hostfxr/postinstall | 17 ++++++++ 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHostResolver.proj create mode 100644 src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall create mode 100644 src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index b330f351996dc9..10d12f6febedda 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -5,7 +5,7 @@ RuntimePack dotnet-runtime-internal - dotnet-runtime + dotnet-runtime dotnet-runtime-symbols NetCore.SharedFramework true diff --git a/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj b/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj index 69982887e4e2dd..4d837532f2d7b6 100644 --- a/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj +++ b/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj @@ -4,6 +4,7 @@ true dotnet-host + dotnet-host-internal Host ToolPack NetCore.SharedHost @@ -12,6 +13,10 @@ sharedhost Dotnet_CLI_SharedHost HostSrc + false + sharedhost + false + osx_scripts/host @@ -24,8 +29,8 @@ - + + + + + true + dotnet-hostfxr + dotnet-hostfxr-internal + Host FX Resolver + ToolPack + NetCore.HostFXR + true + hostfxr + Dotnet_CLI_HostFxr + HostFxrSrc + hostfxr + osx_scripts/hostfxr + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall b/src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall new file mode 100644 index 00000000000000..33d9db28f2fb9c --- /dev/null +++ b/src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. +# + +PACKAGE=$1 +INSTALL_DESTINATION=$2 + +# A temporary fix for the permissions issue(s) +chmod 755 $INSTALL_DESTINATION/dotnet + +# Add the installation directory to the system-wide paths +# But first create the directory if it doesn't exist +mkdir -p /etc/paths.d +echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet + +exit 0 diff --git a/src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall b/src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall new file mode 100644 index 00000000000000..b8c5e60b92d99f --- /dev/null +++ b/src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. +# + +PACKAGE=$1 +INSTALL_DESTINATION=$2 + +# A temporary fix for the permissions issue(s) +chmod 755 $INSTALL_DESTINATION/dotnet + +# Add the installation directory to the system-wide paths +echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet + +exit 0 From 7ad730468261021d023ecadfcadd9ad1d7ef41e6 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 11:00:13 -0700 Subject: [PATCH 008/185] Rename host and hostfxr projects to ensure we don't collide with the nuget packaging projects. --- .../{Microsoft.NETCore.DotNetHost.proj => dotnet-host.proj} | 0 ...rosoft.NETCore.DotNetHostResolver.proj => dotnet-hostfxr.proj} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/installer/pkg/newsfx/installers/{Microsoft.NETCore.DotNetHost.proj => dotnet-host.proj} (100%) rename src/installer/pkg/newsfx/installers/{Microsoft.NETCore.DotNetHostResolver.proj => dotnet-hostfxr.proj} (100%) diff --git a/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHost.proj rename to src/installer/pkg/newsfx/installers/dotnet-host.proj diff --git a/src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHostResolver.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/Microsoft.NETCore.DotNetHostResolver.proj rename to src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj From ece261c8593359f6bfc03299ae06f0124498b382 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 11:22:02 -0700 Subject: [PATCH 009/185] Add bundle installer. --- .../Microsoft.NETCore.App.Bundle.bundleproj | 26 ++++ src/installer/pkg/newsfx/bundle/bundle.thm | 114 ++++++++++++++++++ src/installer/pkg/newsfx/bundle/bundle.wxl | 74 ++++++++++++ .../osx_resources/cs.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/cs.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/cs.lproj/welcome.html | 22 ++++ .../osx_resources/de.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/de.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/de.lproj/welcome.html | 22 ++++ .../bundle/osx_resources/dotnetbackground.png | Bin 0 -> 4601 bytes .../osx_resources/en.lproj/conclusion.html | 24 ++++ .../bundle/osx_resources/en.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/en.lproj/welcome.html | 21 ++++ .../osx_resources/es.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/es.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/es.lproj/welcome.html | 22 ++++ .../osx_resources/fr.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/fr.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/fr.lproj/welcome.html | 22 ++++ .../osx_resources/it.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/it.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/it.lproj/welcome.html | 22 ++++ .../osx_resources/ja.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/ja.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/ja.lproj/welcome.html | 22 ++++ .../osx_resources/ko.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/ko.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/ko.lproj/welcome.html | 22 ++++ .../osx_resources/pl.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/pl.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/pl.lproj/welcome.html | 22 ++++ .../osx_resources/pt-br.lproj/conclusion.html | 25 ++++ .../bundle/osx_resources/pt-br.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/pt-br.lproj/welcome.html | 22 ++++ .../bundle/osx_resources/ru.lproj/eula.rtf | Bin 0 -> 1291 bytes .../bundle/osx_resources/tr.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/zh-hans.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx_resources/zh-hant.lproj/eula.rtf | Bin 0 -> 1291 bytes ...shared-framework-distribution-template.xml | 12 ++ .../pkg/newsfx/bundle/theme/1028/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1029/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1031/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1033/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1036/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1040/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1041/bundle.wxl | 75 ++++++++++++ .../pkg/newsfx/bundle/theme/1042/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1045/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1046/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1049/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/1055/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/2052/bundle.wxl | 74 ++++++++++++ .../pkg/newsfx/bundle/theme/3082/bundle.wxl | 74 ++++++++++++ 53 files changed, 1731 insertions(+) create mode 100644 src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj create mode 100644 src/installer/pkg/newsfx/bundle/bundle.thm create mode 100644 src/installer/pkg/newsfx/bundle/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/dotnetbackground.png create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/ru.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/tr.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/zh-hans.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/osx_resources/zh-hant.lproj/eula.rtf create mode 100644 src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml create mode 100644 src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl create mode 100644 src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj new file mode 100644 index 00000000000000..aaa9232a5c6826 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -0,0 +1,26 @@ + + + + + + .NET Core Shared Framework Bundle Installer + $(MSBuildProjectDirectory) + Microsoft.NETCore.App + dotnet-runtime + win-x86;win-x64;win-arm64;osx-x64 + Runtime + $(MSBuildProjectDirectory)/shared-framework-distribution-template.xml + com.microsoft.dotnet.$(SharedFrameworkName).$(ProductVersion).osx.x64 + osx_resources + + + + + + + + + diff --git a/src/installer/pkg/newsfx/bundle/bundle.thm b/src/installer/pkg/newsfx/bundle/bundle.thm new file mode 100644 index 00000000000000..845b5cbd2caf0e --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/bundle.thm @@ -0,0 +1,114 @@ + + + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + #(loc.Title) + + + + + #(loc.HelpHeader) + #(loc.HelpText) + + + + + + + + + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) + #(loc.LicenseAssent) + #(loc.PrivacyStatementLink) + #(loc.EulaLink) + + + + + + + + #(loc.OptionsHeader) + #(loc.OptionsLocationLabel) + + + + + + + + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + + + + + + + + + + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + + + + #(loc.ModifyHeader) + + + + + + + + + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + #(loc.SuccessInstallLocation) + #(loc.SuccessInstallProductName) + #(loc.ResourcesHeader) + #(loc.DocumentationLink) + #(loc.RelaseNotesLink) + #(loc.TutorialLink) + #(loc.TelemetryLink) + + + + + + + + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + diff --git a/src/installer/pkg/newsfx/bundle/bundle.wxl b/src/installer/pkg/newsfx/bundle/bundle.wxl new file mode 100644 index 00000000000000..5523036197cf03 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] Installer + [BUNDLEMONIKER] + You just need a shell, a text editor and 10 minutes of your time. + +Ready? Set? Let's go! + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + I &agree to the license terms and conditions + &Options + &Install + &Close + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Close + Repair Successfully Completed + Uninstall Successfully Completed + Installation was successful + Setup Successful + &Launch + You must restart your computer before you can use the software. + &Restart + &Close + Setup Failed + Setup Failed + Uninstall Failed + Repair Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + The [PRODUCT_NAME] is not supported on this operating system. For more information, see [LINK_PREREQ_PAGE]. + The [PRODUCT_NAME] isn't supported on x86 operating systems. Please install using the corresponding x86 installer. + Files In Use + The following applications are using files that need to be updated: + Close the &applications and attempt to restart them. + &Do not close applications. A reboot will be required. + &OK + &Cancel + .NET Runtime + The .NET Runtime is used to run .NET applications, on your Windows computer. .NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + Learn more about .NET + The following was installed at [DOTNETHOME] + - [BUNDLEMONIKER] + Resources + <A HREF="https://aka.ms/dotnet-docs">Documentation</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Release Notes</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetry</A> + <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> + <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> + By clicking Install, you agree to the following terms. + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/dotnetbackground.png b/src/installer/pkg/newsfx/bundle/osx_resources/dotnetbackground.png new file mode 100644 index 0000000000000000000000000000000000000000..16a6bf22ba789a0eb41ce25b92ba9915b2293af3 GIT binary patch literal 4601 zcmeHKc~FyC693Rq6b4v^Lq{OE<7ga0R0au`z^EJw!>wH54wn!Jhuk4iDdoNtaJWY@ z2*?q_k;n~$NfZbXxeQ1m1Vlit1Ok`@HdFJ@RBhGP)=q8J*3`bL*RQ%?zh8HC_j}bZ z#m34^O5%hB002_guNm6`zyTxxh?O5XERwjC6{1CpScIL~6`+1dc~QiC;eXlkG5`>= zBn4iFMEudvYt9h>Al>)d6r-Z5d;mb^LFAV;qU zN*W*R4GVqdeW<$RUb4#lsIz0^vXTMf@ap_j6ZF@5Dv-f|>d|~F74bR;zIZ`3*3+V; zd1NuY>d+Otez?R@ycF_bCqK@^U}5!eew)R^l@QLrDz^v4D=mtk8!UwQaS9?8(KT%%v7&ihY{8yrk_p5^nuO+2rPK)|kw>ZriMY zmNTmKvMaYE>1%j@>T1)mxiwkf!Y$h`;GiHO1nkXS1~)?c)u3s_OXDEybI605`KsHr zU`_7MWE9UyQO8-!S3wKysm@zjrr)c*glM)b+jqi2vs!Wz*@Wn|{vl3LMlzJat92Rq zi5dVgu6~=$-*3md<18D*dVY10?}cfA!d4G$?YyTt7!%$+K4hh@mX}P8BF)nADw(Er zpo%vH)KYJ+1A3L^NTp0DH2thbMQkU44fk^9H7>o=WS6!tau?#MnI;wO$}(7P@AEC| z!`?p4+7#2ml9kr=#?s@eMP*q{Kbd$D4CK3;I~8jtXe_+@@8(%vL8K|$)x{JAC98}s zEhTSqTgI?vg9b*h03)|!5&mB~E=0LDj|EWrx0Vsk#M;ulW$!V{Sjoo%+U71dQYSy> zJobI=-D-pAl>m~O3bw(C z;cq=QL(yYK10$x6jt0(APl2~X=d-eIS8?-p;ls5Phx9&`eTW;SzV{0c?Hg+rFU(DoyIcM97nD8Kb0VC z_lmPAL4~$;QS_K=o8k-I`=xv~WS?`p*>87f>UKrAK5um~ErDM9>I2jmXPc}#&GSa; zoKCC#FnAtRH_k3B!m1IGQ*R4EUn{56rv=>_;Z=s*(jH`M#ji2%_$|T1)0)_LhVoa3 z?%Z!Vk{BF2N(IkW_5$0N5nvpXXZ^%DNFtFUO zgLHcj1Cl|*Af>6@vTbq`E8&~?T#~V)YuwhdH(z&4eKpeqo@-84&zxign9yz0&F9A+ zfBCA?zi@5+Wna+eVVc0kKYBZ;n}w#H02y=t z;wtrxUc4=k0^a}9aBaJx1wrnQLeKDo8*^9bz9S4jB78&cSg8^U19u#yWG&0Wfjg@G z-$)UYuRKw4OMtNRWjeDhwYXqC`aTm{#J*q2?F<0`aFU4)K@M|blrdEfadY)Hb(2$=2`vp(pywGs})xNoU?np9@H)O zHvsq$I4lmw>}CwlBXDKKvB`lr~+$n&jcn;ui zI#ksrcehom;7%ps&%#qJj6$t$Z}Chq(Utc@KeVEfx4Wf55MJGLj+XnGian?cwr zUG?R!A^A1a2LOx7hewF6xH7OP2<2HHxBD>^zL($RuKL&m z8`iO$buI-G@>4o#b{JxazTB~4iR1DO z8j+0i23%nb=WdDUk{~}7CtTvMU)^{~+BS=fiCy>{1^^?_R!>NtL`ml@Z1jK)Op6&? zUqjMAx4YFce7t68`N^;wE9TLQ;=q5ivjO_EjSkTvGR2;@XYwG^_X`;7{ zV`^CDbP(`s{5BElxEM(7YoDNi>#;tZlqg8tM5*G0ko-Vry*&H?@P^=%2qmF?^}9N7 zkTcSTCz9wVgp4$83Y^6;($I4$EUrGw1n$TMT^AMCk#Nso#}59zl&Y*xW$DC0al_cy zTnoA3Kn28R&$R_zk)E$eul`16Rfgq@ZYD1jc5}c~-vRY8mDSyPe8p6&$ep7q3xwW- z?w(jg4|hLT@7g5q#mwC$2nvw7vjPu>yuWa+v1&~8iU3x%bBRzRM3Z}vNhdSYA;_!V zHlIaQ>lRQ-w6UjLwq`yRMBU!1%dFXJ&@W`u{YJ{A0G+Uh(nR!{1B>H=)a?Yrgx6Xl zY#F8qukv7L6r^jbPII>2+NjXd_wINI+1jJS09F!a4l^Ka590e^8sq(@`jo8j!HLr* zz#Z}_hG!5=LgT^(d2L~&#vX6AZleHS3|eciHd1pVc*ajU;DgDc9@{wKyoyoVm?36*`M_dW1i2S?MTbKgqaD>`?!WrfdTJtK9nM+q(r&icGexzTN^~G z$vh2r-K?h(LJ+!XtwZXP-oomNoq^@jeo%%brZ>2rWbo1(#ozU(NR_=iffZEK!q_YD zOdUh?)UB|M)7F$1JEJ0Rf$v`(hPRJpGV=zS%tjmu$H{_xK=Y$(4h|i|M0ZsuQLEZ3 z6{w^(xj#UeO}xv6!_+%8f9WF?jlHtpVn|!NuB9U)X=cY=oQk2S{Q!z>IyhL zCz^Xi6}J$fLYs6_)_MI1y6};=G=DeB6AKN*CFw2i&T?Cj!gpEnfMU_1-AbXT3;Zx| z;fFxD5muT@HlBJ+gAijg&;89brIlS}-Q4i*=!GiZ8c>jUX^QUvrF^*d1(&aF25HbiF}HEvKuHKWte@kcro}Ee1~aQ;s?PTh7EJ`mBe4o=q@yQQb&Rem~wA16#1Gp6@UiSR*W4!-r zz&PsfM__=HlO#uG1$|g)Q4R?-G&~eaD*?cxFO+~EX8&sBPyY-4bAa{KEWn6#7^WMJ!IS7;87YDrUQLbq=&_AAS+k>(~=O>*=&z{4SfF5S<=N?`S zeBz9mY{8E&=y=HLkFWF2>D&t2ivxgo_)?N_1d}sls1bGLOzCHf_)FY?FuR_hd9ZlL zhY=q=FP{b^U#CcTLtipXzj!}xWtNY^Lqv_&g>NMQw;GE*+{&jO)3&2X;C0Iztc<8W zWWWt#z%Ru;hk@+y10ud(v + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html new file mode 100644 index 00000000000000..c896f569d449c3 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html @@ -0,0 +1,21 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html b/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html new file mode 100644 index 00000000000000..e16c4b3148bcd4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html b/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html new file mode 100644 index 00000000000000..8c67baf86afba6 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Runtime

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET

+ +
+ + + diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ru.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/ru.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/tr.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/tr.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/zh-hans.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/zh-hans.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/zh-hant.lproj/eula.rtf b/src/installer/pkg/newsfx/bundle/osx_resources/zh-hant.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml b/src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml new file mode 100644 index 00000000000000..2a1f0b8c7242ff --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl new file mode 100644 index 00000000000000..e44840f4b1ede4 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] 安裝程式 + [BUNDLEMONIKER] + 您只需要殼層、文字編輯器和 10 分鐘的時間。 + +準備好了嗎? 讓我們開始吧! + 您確定要取消嗎? + 前一版 + 安裝程式說明 + /install | /repair | /uninstall | /layout [directory] - 在目錄中安裝、修復、解除安裝或 + 建立搭售方案的完整本機複本。預設為安裝。 + +/passive | /quiet - 顯示最少 UI 且不含提示，或者不顯示 UI，也 + 不顯示提示。預設會顯示 UI 和所有提示。 + +/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 +/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 + 關閉(&C) + 我同意授權條款及條件(&A) + 選項(&O) + 安裝(&I) + 關閉(&C) + 安裝選項 + 安裝位置: + 瀏覽(&B) + 確定(&O) + 取消(&C) + 安裝進度 + 處理中: + 正在初始化... + 取消(&C) + 修改安裝 + 修復(&R) + 解除安裝(&U) + 關閉(&C) + 修復已成功完成 + 解除安裝已成功完成 + 安裝成功 + 設定成功 + 啟動(&L) + 必須重新啟動電腦，才能使用此軟體。 + 重新啟動(&R) + 關閉(&C) + 設定失敗 + 安裝程式失敗 + 解除安裝失敗 + 修復失敗 + 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 + 必須重新啟動電腦，才能完成軟體的復原。 + 重新啟動(&R) + 關閉(&C) + 此作業系統不支援 [PRODUCT_NAME]。如需詳細資訊，請參閱 [LINK_PREREQ_PAGE]。 + x86 作業系統不支援 [PRODUCT_NAME]。請使用對應的 x86 安裝程式來安裝。 + 使用中的檔案 + 以下應用程式正在使用需要進行更新的檔案: + 關閉應用程式並嘗試重新啟動(&A) + 不關閉應用程式，需要重新啟動(&D) + 確定(&O) + 取消(&C) + .NET Runtime + .NET Runtime 可用於在您的 Windows 電腦上執行 .NET 應用程式。.NET 為開放原始碼形式，且可跨平台運作，同時受到 Microsoft 支援。希望您會喜歡! + 深入了解 .NET + 下列項目已安裝在 [DOTNETHOME] + - [BUNDLEMONIKER] + 資源 + <A HREF="https://aka.ms/dotnet-docs">文件</A> + <A HREF="https://aka.ms/20-p2-rel-notes">版本資訊</A> + <A HREF="https://aka.ms/dotnet-tutorials">教學課程</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 遙測</A> + <A HREF="https://aka.ms/dev-privacy">隱私權聲明</A> + <A HREF="https://aka.ms/dotnet-license-windows">.NET 的授權資訊</A> + 按一下 [\[]安裝[\[] 即表示您同意下列條款。 + diff --git a/src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl new file mode 100644 index 00000000000000..4830781cfddc2b --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl @@ -0,0 +1,74 @@ + + + Instalační program pro [WixBundleName] + [BUNDLEMONIKER] + Potřebujete jenom prostředí, textový editor a 10 minut času. + +Jste připraveni? Dejme se tedy do toho! + Opravdu chcete akci zrušit? + Předchozí verze + Nápověda k instalaci + /install | /repair | /uninstall | /layout [adresář] – Nainstaluje, opraví, odinstaluje nebo + vytvoří úplnou místní kopii svazku v adresáři. Výchozí možností je instalace. + +/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a + žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev. + +/norestart – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu. +/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%. + &Zavřít + &Souhlasím s licenčními podmínkami + &Možnosti + &Nainstalovat + &Zavřít + Možnosti nastavení + Umístění instalace: + &Procházet + &OK + &Storno + Průběh instalace + Zpracování: + Inicializuje se... + &Storno + Změnit instalaci + Op&ravit + O&dinstalovat + &Zavřít + Oprava se úspěšně dokončila. + Odinstalace se úspěšně dokončila. + Instalace proběhla úspěšně. + Instalace byla úspěšná. + &Spustit + Před použitím tohoto softwaru musíte restartovat počítač. + &Restartovat + &Zavřít + Instalace se nezdařila. + Instalace se nepovedla. + Odinstalace se nepovedla. + Oprava se nepovedla. + Instalace se nepovedla kvůli jednomu nebo víc problémům. Opravte tyto problémy a zkuste software znovu nainstalovat. Další informace najdete v <a href="#">souboru protokolu</a>. + Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač. + &Restartovat + &Zavřít + [PRODUCT_NAME] se tomto operačním systému nepodporuje. Další informace: [LINK_PREREQ_PAGE] + [PRODUCT_NAME] se v operačních systémech pro platformu x86 nepodporuje. Použijte prosím k instalaci odpovídající instalační program pro platformu x86. + Používané soubory + Následující aplikace používají soubory, které je potřeba aktualizovat: + Zavřete &aplikace a zkuste je restartovat. + A&plikace nezavírejte. Bude potřeba provést restart. + &OK + &Zrušit + Modul runtime .NET + Modul .NET Runtime se používá ke spouštění aplikací .NET na počítači s Windows. .NET je open source, k dispozici pro více platforem a podporovaný Microsoftem. Doufáme, že se vám bude líbit! + Další informace o .NET + Do [DOTNETHOME] se nainstalovaly následující položky. + - [BUNDLEMONIKER] + Prostředky + <A HREF="https://aka.ms/dotnet-docs">Dokumentace</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Zpráva k vydání verze</A> + <A HREF="https://aka.ms/dotnet-tutorials">Kurzy</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetrie pro platformu .NET</A> + <A HREF="https://aka.ms/dev-privacy">Prohlášení o zásadách ochrany osobních údajů</A> + <A HREF="https://aka.ms/dotnet-license-windows">Informace o licencování pro .NET</A> + Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl new file mode 100644 index 00000000000000..b2798f78a223e5 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName]-Installer + [BUNDLEMONIKER] + Sie benötigen nur eine Shell, einen Text-Editor und 10 Minuten Zeit. + +Bereit? Los geht's! + Möchten Sie den Vorgang wirklich abbrechen? + Vorherige Version + Hilfe zum Setup + /install | /repair | /uninstall | /layout [Verzeichnis]: Installiert, repariert, deinstalliert oder + erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. "Installieren" ist die Standardeinstellung. + +/passive | /quiet: Zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine + Benutzeroberfläche und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt. + +/norestart: Unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf. +/log log.txt: Erstellt das Protokoll in einer bestimmten Datei. Standardmäßig wird die Protokolldatei in %TEMP% erstellt. + S&chließen + Ich &stimme den Lizenzbedingungen zu. + &Optionen + &Installieren + S&chließen + Setupoptionen + Installationsspeicherort: + &Durchsuchen + &OK + &Abbrechen + Setupstatus + Wird verarbeitet: + Initialisierung... + &Abbrechen + Setup ändern + &Reparieren + &Deinstallieren + S&chließen + Die Reparatur wurde erfolgreich abgeschlossen. + Die Deinstallation wurde erfolgreich abgeschlossen. + Die Installation war erfolgreich. + Setup wurde erfolgreich abgeschlossen + &Starten + Sie müssen den Computer neu starten, bevor Sie die Software verwenden können. + &Neu starten + S&chließen + Setupfehler + Setupfehler + Deinstallationsfehler + Reparaturfehler + Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie das Setup erneut aus. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. + Sie müssen Ihren Computer neu starten, um den Rollback der Software abzuschließen. + &Neu starten + &Schließen + [PRODUCT_NAME] wird auf diesem Betriebssystem nicht unterstützt. Weitere Informationen finden Sie unter [LINK_PREREQ_PAGE]. + [PRODUCT_NAME] wird auf x86-Betriebssystemen nicht unterstützt. Installieren Sie das entsprechende x86-Installationsprogramm. + Verwendete Dateien + Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen: + Schließen Sie die &Anwendungen, und versuchen Sie sie erneut zu starten. + &Anwendungen nicht schließen. Ein Neustart ist erforderlich. + &OK + &Abbrechen + .NET-Runtime + Die .NET-Runtime wird zum Ausführen von .NET-Anwendungen auf Ihrem Windows-Computer verwendet. .NET ist ein plattformübergreifendes Open-Source-Framework, das von Microsoft unterstützt wird. Wir wünschen Ihnen viel Spaß damit! + Weitere Informationen zu .NET + Folgendes wurde unter [DOTNETHOME] installiert. + - [BUNDLEMONIKER] + Ressourcen + <A HREF="https://aka.ms/dotnet-docs">Dokumentation</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Versionshinweise</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET-Telemetrie</A> + <A HREF="https://aka.ms/dev-privacy">Datenschutzerklärung</A> + <A HREF="https://aka.ms/dotnet-license-windows">Lizenzierungsinformationen für .NET</A> + Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl new file mode 100644 index 00000000000000..5523036197cf03 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] Installer + [BUNDLEMONIKER] + You just need a shell, a text editor and 10 minutes of your time. + +Ready? Set? Let's go! + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + I &agree to the license terms and conditions + &Options + &Install + &Close + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Close + Repair Successfully Completed + Uninstall Successfully Completed + Installation was successful + Setup Successful + &Launch + You must restart your computer before you can use the software. + &Restart + &Close + Setup Failed + Setup Failed + Uninstall Failed + Repair Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + The [PRODUCT_NAME] is not supported on this operating system. For more information, see [LINK_PREREQ_PAGE]. + The [PRODUCT_NAME] isn't supported on x86 operating systems. Please install using the corresponding x86 installer. + Files In Use + The following applications are using files that need to be updated: + Close the &applications and attempt to restart them. + &Do not close applications. A reboot will be required. + &OK + &Cancel + .NET Runtime + The .NET Runtime is used to run .NET applications, on your Windows computer. .NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + Learn more about .NET + The following was installed at [DOTNETHOME] + - [BUNDLEMONIKER] + Resources + <A HREF="https://aka.ms/dotnet-docs">Documentation</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Release Notes</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetry</A> + <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> + <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> + By clicking Install, you agree to the following terms. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl new file mode 100644 index 00000000000000..aad9a6e9196361 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl @@ -0,0 +1,74 @@ + + + Programme d'installation de [WixBundleName] + [BUNDLEMONIKER] + Vous avez juste besoin d'un interpréteur de commandes, d'un éditeur de texte et de 10 minutes. + +À vos marques ? Prêt ? Partez ! + Voulez-vous vraiment annuler ? + Version précédente + Aide à l'installation + /install | /repair | /uninstall | /layout [répertoire] - installe, répare, désinstalle ou + crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut. + +/passive | /quiet - affiche une interface utilisateur minimale, sans invite, ou n'affiche + ni interface utilisateur, ni invite. Par défaut, l'interface utilisateur et toutes les invites sont affichées. + +/norestart - supprime toutes les tentatives de redémarrage. Par défaut, l'interface utilisateur affiche une invite avant le redémarrage. +/log log.txt - enregistre les informations dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%. + &Fermer + J'&accepte les conditions générales de la licence + &Options + &Installer + &Fermer + Options d'installation + Emplacement d'installation : + &Parcourir + &OK + &Annuler + Progression de l'installation + En cours : + Initialisation... + &Annuler + Modifier l'installation + &Réparer + &Désinstaller + &Fermer + Réparation terminée avec succès + Désinstallation terminée avec succès + Installation réussie + Installation/désinstallation réussie + &Démarrer + Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel. + &Redémarrer + &Fermer + Échec de l'installation + Échec de l'installation + Échec de la désinstallation + Échec de la réparation + Un ou plusieurs problèmes sont à l'origine de l'échec de l'installation. Corrigez ces problèmes, puis recommencez l'installation. Pour plus d'informations, voir le <a href="#">fichier journal</a>. + Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel. + &Redémarrer + &Fermer + [PRODUCT_NAME] n'est pas pris en charge sur ce système d'exploitation. Pour plus d'informations, consultez [LINK_PREREQ_PAGE]. + [PRODUCT_NAME] n'est pas pris en charge sur les systèmes d'exploitation x86. Effectuez l'installation à l'aide du programme d'installation x86 correspondant. + Fichiers en cours d'utilisation + Les applications suivantes utilisent des fichiers nécessitant une mise à jour : + &Fermer les applications essayez de les ouvrir de nouveau. + &Ne pas fermer les applications. Un redémarrage sera nécessaire. + &OK + &Annuler + Runtime .NET + Le runtime .NET vous permet d'exécuter les applications .NET sur votre ordinateur Windows. .NET est open source, multiplateforme et pris en charge par Microsoft. Nous espérons que vous l'apprécierez ! + En savoir plus sur .NET + L'élément suivant a été installé sur [DOTNETHOME] + - [BUNDLEMONIKER] + Ressources + <A HREF="https://aka.ms/dotnet-docs">Documentation</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Notes de publication</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutoriels</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Télémétrie .NET</A> + <A HREF="https://aka.ms/dev-privacy">Déclaration de confidentialité</A> + <A HREF="https://aka.ms/dotnet-license-windows">Informations de licence pour .NET</A> + En cliquant sur Installer, vous acceptez les conditions suivantes. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl new file mode 100644 index 00000000000000..ff4a8011e3a1b8 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl @@ -0,0 +1,74 @@ + + + Programma di installazione di [WixBundleName] + [BUNDLEMONIKER] + Bastano solo una shell, un editor di testo e 10 minuti di tempo. + +Pronti per iniziare? + Annullare? + Versione precedente + Guida alla configurazione + /install | /repair | /uninstall | /layout [directory] - installa, ripara, disinstalla o + crea una copia locale completa del bundle nella directory. L'opzione predefinita è install. + +/passive | /quiet - visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente + né prompt. Per impostazione predefinita, viene visualizzata l'intera interfaccia utente e tutti i prompt. + +/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. +/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%. + &Chiudi + &Accetto i termini e le condizioni di licenza + &Opzioni + I&nstalla + &Chiudi + Opzioni di installazione + Percorso di installazione: + &Sfoglia + &OK + &Annulla + Stato installazione + Elaborazione di: + Inizializzazione in corso... + &Annulla + Modifica installazione + &Ripara + &Disinstalla + &Chiudi + La riparazione è stata completata + La disinstallazione è stata completata + L'installazione è riuscita + L'installazione è stata completata + &Avvia + Per poter usare il software, è necessario riavviare il computer. + &Riavvia + &Chiudi + L'installazione non è riuscita + L'installazione non è riuscita + La disinstallazione non è riuscita + La riparazione non è riuscita + L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e ripetere l'installazione. Per altre informazioni, vedere il <a href="#">file di log</a>. + Per completare il rollback del software, è necessario riavviare il computer. + &Riavvia + &Chiudi + [PRODUCT_NAME] non è supportato in questo sistema operativo. Per altre informazioni, vedere [LINK_PREREQ_PAGE]. + [PRODUCT_NAME] non è supportato in sistemi operativi x86. Eseguire l'installazione usando il programma di installazione x86 corrispondente. + File in uso + Le applicazioni seguenti usano file che necessitano di aggiornamento: + Chiudere le &applicazioni e provare a riavviarle. + &Non chiudere le applicazioni; sarà necessario riavviare il sistema + &OK + &Annulla + Runtime di .NET + Runtime di .NET consente di eseguire applicazioni .NET nel computer Windows. .NET è open source, multipiattaforma e supportato da Microsoft. + Altre informazioni su .NET + I componenti seguenti sono stati installati in [DOTNETHOME] + - [BUNDLEMONIKER] + Risorse + <A HREF="https://aka.ms/dotnet-docs">Documentazione</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Note sulla versione</A> + <A HREF="https://aka.ms/dotnet-tutorials">Esercitazioni</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria di .NET</A> + <A HREF="https://aka.ms/dev-privacy">Informativa sulla privacy</A> + <A HREF="https://aka.ms/dotnet-license-windows">Informazioni sulla licenza per .NET</A> + Facendo clic su Installa, si accettano le condizioni seguenti. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl new file mode 100644 index 00000000000000..14392af22fcf78 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl @@ -0,0 +1,75 @@ + + + [WixBundleName] インストーラー + [BUNDLEMONIKER] + 必要なのは、シェル、テキスト エディター、それに時間が 10 分のみです。 + +では、始めましょう。 + 取り消しますか? + 以前のバージョン + セットアップのヘルプ + /install | /repair | /uninstall | /layout [directory] - バンドルの完全なローカル コピーに対する + ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への + 作成を行います。既定の設定はインストールです。 + +/passive | /quiet - 最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも + 表示しません。既定では UI とすべてのプロンプトが表示されます。 + +/norestart - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。 +/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。 + 閉じる(&C) + ライセンス条項および使用条件に同意する(&A) + オプション(&O) + インストール(&I) + 閉じる(&C) + セットアップ オプション + インストールの場所: + 参照(&B) + OK(&O) + キャンセル(&C) + セットアップの進行状況 + 処理中: + 初期化しています... + キャンセル(&C) + セットアップの変更 + 修復(&R) + アンインストール(&U) + 閉じる(&C) + 修復が正常に完了しました + アンインストールが正常に完了しました + インストールが正常に終了しました + セットアップ完了 + 起動(&L) + ソフトウェアを使用する前にコンピューターを再起動する必要があります。 + 再起動(&R) + 閉じる(&C) + セットアップ失敗 + セットアップに失敗しました + アンインストールに失敗しました + 修復に失敗しました + 1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 + ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 + 再起動(&R) + 閉じる(&C) + [PRODUCT_NAME] は、このオペレーティング システムではサポートされていません。詳細については、[LINK_PREREQ_PAGE] を参照してください。 + x86 オペレーティング システムでは、[PRODUCT_NAME] はサポートされていません。対応する x86 インストーラーを使用してインストールしてください。 + ファイルが使用中 + 次のアプリケーションは、更新の必要があるファイルを使用しています: + アプリケーションを閉じて再起動を試みる。(&A) + アプリケーションを終了させない (コンピューターの再起動が必要になります)(&D) + OK(&O) + キャンセル(&C) + .NET Runtime + .NET Runtime は、Windows コンピューターで .NET アプリケーションを実行するために使用されます。.NET はオープン ソースのクロス プラットフォームで、Microsoft によってサポートされています。ぜひご利用ください。 + .Net の詳細情報 + [DOTNETHOME] に以下がインストールされました + - [BUNDLEMONIKER] + リソース + <A HREF="https://aka.ms/dotnet-docs">ドキュメント</A> + <A HREF="https://aka.ms/20-p2-rel-notes">リリース ノート</A> + <A HREF="https://aka.ms/dotnet-tutorials">チュートリアル</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET テレメトリ</A> + <A HREF="https://aka.ms/dev-privacy">プライバシーに関する声明</A> + <A HREF="https://aka.ms/dotnet-license-windows">.NET のライセンス情報</A> + [インストール] をクリックすると、次の条項に同意したものと見なされます。 + diff --git a/src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl new file mode 100644 index 00000000000000..f07c56b4a5a42c --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] 설치 관리자 + [BUNDLEMONIKER] + 셸, 텍스트 편집기, 10분의 시간만 있으면 됩니다. + +준비되셨나요? 시작합니다! + 취소하시겠습니까? + 이전 버전 + 설치 도움말 + /install | /repair | /uninstall | /layout [directory] - 디렉터리에 번들의 전체 로컬 복사본을 설치, 복구, 제거 또는 + 작성합니다. 설치가 기본값입니다. + +/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 + 프롬프트를 표시하지 않습니다. 기본적으로 UI와 모든 프롬프트가 표시됩니다. + +/norestart - 다시 시작하지 않게 합니다. 기본적으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. +/log log.txt - 특정 파일에 기록합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다. + 닫기(&C) + 동의함(&A) + 옵션(&O) + 설치(&I) + 닫기(&C) + 설치 옵션 + 설치 위치: + 찾아보기(&B) + 확인(&O) + 취소(&C) + 설치 진행률 + 처리 중: + 초기화 중... + 취소(&C) + 설치 수정 + 복구(&R) + 제거(&U) + 닫기(&C) + 복구 완료됨 + 제거 완료됨 + 설치가 완료되었습니다. + 설치 완료 + 시작(&L) + 소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다. + 다시 시작(&R) + 닫기(&C) + 설치 실패 + 설치 실패 + 제거 실패 + 복구 실패 + 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. + 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. + 다시 시작(&R) + 닫기(&C) + 이 운영 체제에서는 [PRODUCT_NAME]이(가) 지원되지 않습니다. 자세한 내용은 [LINK_PREREQ_PAGE]을(를) 참조하세요. + x86 운영 체제에서는 [PRODUCT_NAME]이(가) 지원되지 않습니다. 해당 x86 설치 관리자를 사용하여 설치하세요. + 사용 중인 파일 + 다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다. + 애플리케이션을 닫고 다시 시작합니다(&A). + 애플리케이션을 닫지 않습니다(&D). 다시 부팅해야 합니다. + 확인(&O) + 취소(&C) + .NET 런타임 + .NET 런타임은 Windows 컴퓨터에서 .NET 애플리케이션을 실행하는 데 사용됩니다. .NET은 오픈 소스 및 플랫폼 간이며 Microsoft에서 지원합니다. .NET을 유용하게 사용하시길 바랍니다. + .NET에 대한 자세한 정보 + 다음이 [DOTNETHOME]에 설치되었습니다. + - [BUNDLEMONIKER] + 리소스 + <A HREF="https://aka.ms/dotnet-docs">설명서</A> + <A HREF="https://aka.ms/20-p2-rel-notes">릴리스 정보</A> + <A HREF="https://aka.ms/dotnet-tutorials">자습서</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 원격 분석</A> + <A HREF="https://aka.ms/dev-privacy">개인정보처리방침</A> + <A HREF="https://aka.ms/dotnet-license-windows">.NET에 대한 라이선스 정보</A> + [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl new file mode 100644 index 00000000000000..c7f294d950909e --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl @@ -0,0 +1,74 @@ + + + Instalator pakietu [WixBundleName] + [BUNDLEMONIKER] + Potrzebujemy tylko powłoki, edytora tekstu i 10 minut czasu. + +Wszystko gotowe? Zaczynamy! + Czy na pewno chcesz anulować? + Poprzednia wersja + Pomoc dotycząca instalacji + /install | /repair | /uninstall | /layout [katalog] - Instaluje, naprawia, odinstalowuje + lub tworzy pełną lokalną kopię pakietu w katalogu. Domyślnie jest używany przełącznik install. + +/passive | /quiet - Wyświetla ograniczony interfejs użytkownika bez monitów albo nie wyświetla ani interfejsu użytkownika, + ani monitów. Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity. + +/norestart - Pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem. +/log log.txt - Tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%. + &Zamknij + &Zgadzam się z postanowieniami licencyjnymi + &Opcje + &Zainstaluj + &Zamknij + Opcje instalacji + Lokalizacja instalacji: + &Przeglądaj + &OK + &Anuluj + Postęp instalacji + Przetwarzanie: + Trwa inicjowanie... + &Anuluj + Modyfikuj instalację + &Napraw + &Odinstaluj + &Zamknij + Pomyślnie ukończono naprawę + Pomyślnie ukończono dezinstalację + Instalacja przebiegła pomyślnie + Pomyślnie ukończono instalację + &Uruchom + Aby móc korzystać z oprogramowania, musisz uruchomić ponownie komputer. + &Uruchom ponownie + &Zamknij + Instalacja nie powiodła się + Instalacja nie powiodła się + Dezinstalacja nie powiodła się + Naprawa nie powiodła się + Co najmniej jeden problem spowodował niepowodzenie instalacji. Rozwiąż problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji, zobacz <a href="#">plik dziennika</a>. + Aby ukończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer. + &Uruchom ponownie + &Zamknij + Produkt [PRODUCT_NAME] nie jest obsługiwany w tym systemie operacyjnym. Aby uzyskać więcej informacji, zobacz [LINK_PREREQ_PAGE]. + Produkt [PRODUCT_NAME] nie jest obsługiwany w systemach operacyjnych x86. Przeprowadź instalację przy użyciu odpowiedniego instalatora x86. + Pliki w użyciu + Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane: + Zamknij &aplikacje i spróbuj je ponownie uruchomić. + &Nie zamykaj aplikacji. Będzie konieczne ponowne uruchomienie. + &OK + &Anuluj + Środowisko uruchomieniowe platformy .NET + Środowisko uruchomieniowe platformy .NET służy do uruchamiania aplikacji platformy .NET na komputerze z systemem Windows. Platforma .NET jest oprogramowaniem typu open source, działa na różnych platformach i jest obsługiwana przez firmę Microsoft. Mamy nadzieję, że Ci się podoba! + Dowiedz się więcej o platformie .NET + Następujące elementy zainstalowano w [DOTNETHOME] + - [BUNDLEMONIKER] + Zasoby + <A HREF="https://aka.ms/dotnet-docs">Dokumentacja</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Informacje o wersji</A> + <A HREF="https://aka.ms/dotnet-tutorials">Samouczki</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria platformy .NET</A> + <A HREF="https://aka.ms/dev-privacy">Zasady zachowania poufności informacji</A> + <A HREF="https://aka.ms/dotnet-license-windows">Informacje o licencjonowaniu dla platformy .NET</A> + Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl new file mode 100644 index 00000000000000..2de87f08da3141 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl @@ -0,0 +1,74 @@ + + + Instalador do [WixBundleName] + [BUNDLEMONIKER] + Você só precisa de um shell, um editor de texto e 10 minutos de seu tempo. + +Tudo pronto? Então, vamos nessa! + Tem certeza de que deseja cancelar? + Versão anterior + Ajuda de Instalação + /install | /repair | /uninstall | /layout [diretório] - instala, repara, desinstala ou + cria uma cópia local completa do pacote no diretório. Install é o padrão + +/passive | /quiet - exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e + nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos. + +/norestart - suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. +/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. + &Fechar + Eu &concordo com os termos e condições da licença + &Opções + &Instalar + &Fechar + Opções de Instalação + Local de instalação: + &Navegar + &OK + &Cancelar + Progresso da Instalação + Processando: + Inicializando... + &Cancelar + Modificar Instalação + &Reparar + &Desinstalar + &Fechar + Reparação Concluída com Êxito + Desinstalação Concluída com Êxito + A instalação foi bem-sucedida + Instalação com Êxito + &Iniciar + Você deve reiniciar seu computador antes de usar o software. + &Reiniciar + &Fechar + Falha na Instalação + Falha na Instalação + Falha na Desinstalação + Falha na Reparação + Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. + Você deve reiniciar seu computador para concluir a reversão do software. + &Reiniciar + &Fechar + Não há suporte para o [PRODUCT_NAME] neste sistema operacional. Para obter mais informações, confira [LINK_PREREQ_PAGE]. + O [PRODUCT_NAME] não tem suporte em sistemas operacionais x86. Instale usando o instalador x86 correspondente. + Arquivos em Uso + Os aplicativos a seguir estão usando arquivos que precisam ser atualizados: + Feche os &aplicativos e tente reiniciá-los. + &Não feche os aplicativos. Será necessária uma reinicialização. + &OK + &Cancelar + Runtime do .NET + O Runtime do .NET é usado para executar aplicativos .NET no seu computador com Windows. O .NET é um software livre, com plataforma cruzada e possui o suporte da Microsoft. Esperamos que você goste! + Saiba mais sobre o .NET + O seguinte foi instalado em [DOTNETHOME] + - [BUNDLEMONIKER] + Recursos + <A HREF="https://aka.ms/dotnet-docs">Documentação</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Notas sobre a Versão</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutoriais</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria do .NET</A> + <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> + < A HREF = "https://aka.ms/dotnet-License-Windows" > Informações de licenciamento para .NET</A> + Ao clicar em instalar, você concorda com os termos a seguir. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl new file mode 100644 index 00000000000000..fec46b49a5c549 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl @@ -0,0 +1,74 @@ + + + Установщик [WixBundleName] + [BUNDLEMONIKER] + Вам требуется только оболочка, текстовый редактор и 10 минут времени. + +Готовы? Тогда начинаем! + Вы действительно хотите отменить? + Предыдущая версия + Справка по установке + /install | /repair | /uninstall | /layout [каталог] — установка, восстановление, удаление или + создание полной локальной копии пакета в каталоге. По умолчанию — установка. + +/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и + без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы. + +/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. +/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. + &Закрыть + Я &принимаю условия лицензии + &Параметры + &Установить + &Закрыть + Параметры установки + Расположение установки: + &Обзор + &ОК + Отм&ена + Ход установки + Обработка: + Идет инициализация... + Отм&ена + Изменение установки + &Исправить + &Удалить + &Закрыть + Восстановление успешно завершено + Удаление успешно завершено + Установка успешно завершена + Установка успешно завершена + &Запустить + Перед использованием программного обеспечения необходимо перезапустить компьютер. + &Перезапустить + &Закрыть + Настройка не завершена + Сбой установки + Сбой удаления + Сбой восстановления + Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. + Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. + &Перезапустить + З&акрыть + Продукт [PRODUCT_NAME] не поддерживается в этой операционной системе. Дополнительные сведения: [LINK_PREREQ_PAGE]. + Продукт [PRODUCT_NAME] не поддерживается в операционных системах x86. Установите с помощью соответствующего установщика x86. + Используемые файлы + Следующие приложения используют файлы, которые следует обновить: + Закрыть &приложения и попытаться перезапустить их. + &Не закрывать приложения. Потребуется перезагрузка. + О&К + &Отмена + Среда выполнения .NET + Среда выполнения .NET используется для запуска приложений .NET на компьютерах с Windows. Среда .NET является открытой, кроссплатформенной и поддерживается Майкрософт. Надеемся, вам понравится! + Дополнительные сведения о .NET + Следующее было установлено в [DOTNETHOME] + - [BUNDLEMONIKER] + Ресурсы + <A HREF="https://aka.ms/dotnet-docs">Документация</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Заметки о выпуске</A> + <A HREF="https://aka.ms/dotnet-tutorials">Руководства</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Телеметрия .NET</A> + <A HREF="https://aka.ms/dev-privacy">Заявление о конфиденциальности</A> + <A HREF="https://aka.ms/dotnet-license-windows">Сведения о лицензировании .NET</A> + Нажимая кнопку "Установить", вы принимаете следующие условия. + diff --git a/src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl new file mode 100644 index 00000000000000..8dbcef0001ee81 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] Yükleyicisi + [BUNDLEMONIKER] + Yalnızca bir kabuğa, bir metin düzenleyicisine ve 10 dakikalık bir zamana ihtiyacınız var. + +Hazır mısınız? Haydi başlayalım! + İptal etmek istediğinizden emin misiniz? + Önceki sürüm + Kurulum Yardımı + /install | /repair | /uninstall | /layout [dizin] - yükler, onarır, kaldırır ya da + dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir. + +/passive | /quiet - en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve + istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir. + +/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. +/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur. + &Kapat + Lisans &hüküm ve koşullarını kabul ediyorum + &Seçenekler + &Yükle + &Kapat + Kurulum Seçenekleri + Yükleme konumu: + &Gözat + &Tamam + İ&ptal + Kurulum İlerleme Durumu + İşleniyor: + Başlatılıyor... + İ&ptal + Kurulumu Değiştir + &Onar + &Kaldır + &Kapat + Onarım Başarıyla Tamamlandı + Kaldırma Başarıyla Tamamlandı + Yükleme başarılı oldu + Kurulum Başarılı + &Başlat + Yazılımı kullanabilmek için bilgisayarınızı yeniden başlatmanız gerekiyor. + &Yeniden Başlat + &Kapat + Kurulum Başarısız + Kurulum Başarısız + Yükleme Başarısız + Onarım Başarısız + En az bir sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. + Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor. + &Yeniden Başlat + &Kapat + [PRODUCT_NAME] bu işletim sisteminde desteklenmiyor. Daha fazla bilgi için bkz. [LINK_PREREQ_PAGE]. + [PRODUCT_NAME], x86 işletim sistemlerinde desteklenmiyor. Lütfen karşılık gelen x86 yükleyicisini kullanarak yükleyin. + Kullanımda Olan Dosyalar + Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor: + &Uygulamaları kapatın ve yeniden başlatmayı deneyin. + &Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir. + &Tamam + &İptal + .NET Çalışma Zamanı + .NET Çalışma Zamanı, Windows bilgisayarınızda .NET uygulamalarını çalıştırmak için kullanılır. .NET açık kaynaktır, platformlar arasında kullanılabilir ve Microsoft tarafından desteklenmektedir. Beğeneceğinizi umuyoruz! + .NET hakkında daha fazla bilgi edinin + Aşağıdakiler [DOTNETHOME] konumunda yüklendi + - [BUNDLEMONIKER] + Kaynaklar + <A HREF="https://aka.ms/dotnet-docs">Belgeler</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Sürüm Notları</A> + <A HREF="https://aka.ms/dotnet-tutorials">Öğreticiler</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetrisi</A> + <A HREF="https://aka.ms/dev-privacy">Gizlilik Bildirimi</A> + <A HREF="https://aka.ms/dotnet-license-windows">.NET için Lisans Bilgileri</A> + Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. + diff --git a/src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl new file mode 100644 index 00000000000000..4b3cff08cc0e97 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl @@ -0,0 +1,74 @@ + + + [WixBundleName] 安装程序 + [BUNDLEMONIKER] + 你只需要一个 shell、一个文本编辑器，还需花 10 分钟即可。 + +准备好了吗? 要设置? 让我们开始吧! + 是否确实要取消? + 上一版本 + 安装程序帮助 + /install | /repair | /uninstall | /layout [目录] - 安装、修复、卸载 + 目录中的安装包或创建其完整本地副本。Install 为默认选择。 + +/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 + 无提示。默认显示 UI 及全部提示。 + +/norestart - 禁止任何重新启动。默认在重新启动前显示提示 UI。 +/log log.txt - 向特定文件写入日志。默认在 %TEMP% 中创建日志文件。 + 关闭(&C) + 我同意许可条款和条件(&A) + 选项(&O) + 安装(&I) + 关闭(&C) + 安装选项 + 安装位置: + 浏览(&B) + 确定(&O) + 取消(&C) + 安装进度 + 正在处理: + 正在初始化… + 取消(&C) + 修改安装程序 + 修复(&R) + 卸载(&U) + 关闭(&C) + 成功完成了修复 + 成功完成了卸载 + 安装成功 + 设置成功 + 启动(&L) + 在使用此软件之前，您必须重新启动计算机。 + 重新启动(&R) + 关闭(&C) + 设置失败 + 安装失败 + 卸载失败 + 修复失败 + 一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅<a href="#">日志文件</a>。 + 必须重新启动计算机才能完成软件回退。 + 重新启动(&R) + 关闭(&C) + 此操作系统不支持 [PRODUCT_NAME]。有关详细信息，请参阅[LINK_PREREQ_PAGE]。 + x86 操作系统不支持该 [PRODUCT_NAME]。请使用相应的 x86 安装程序进行安装。 + 文件正在使用 + 以下应用程序正在使用的文件需要更新: + 关闭应用程序并尝试重启(&A)。 + 不关闭应用程序(&D)。需要重启。 + 确定(&O) + 取消(&C) + .NET 运行时 + .NET 运行时用于在 Windows 计算机上运行 .NET 应用程序。.NET 是开源、跨平台的，且由 Microsoft 提供支持。希望你喜欢它! + 了解有关 .NET 的详细信息 + 以下项已安装到 [DOTNETHOME] + - [BUNDLEMONIKER] + 资源 + <A HREF="https://aka.ms/dotnet-docs">文档</A> + <A HREF="https://aka.ms/20-p2-rel-notes">发行说明</A> + <A HREF="https://aka.ms/dotnet-tutorials">教程</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 遥测</A> + <A HREF="https://aka.ms/dev-privacy">隐私声明</A> + <A HREF="https://aka.ms/dotnet-license-windows">.NET 的许可信息</A> + 单击“安装”即表示你同意以下条款。 + diff --git a/src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl b/src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl new file mode 100644 index 00000000000000..611eac88f5a633 --- /dev/null +++ b/src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl @@ -0,0 +1,74 @@ + + + Instalador de [WixBundleName] + [BUNDLEMONIKER] + Solo necesita un shell, un editor de texto y 10 minutos. + +¿Preparados? ¿Listos? ¡Ya! + ¿Está seguro de que desea cancelar? + Versión anterior + Ayuda de configuración + /install | /repair | /uninstall | /layout [directorio]: Instala, repara, desinstala o + crea una copia local completa del lote de aplicaciones del directorio. La opción predeterminada es /install. + +/passive | /quiet: muestra la interfaz de usuario mínima sin mensajes o no muestra ninguna interfaz de usuario + ni mensajes. De forma predeterminada, se muestra la interfaz de usuario y todos los mensajes. + +/norestart: suprime todos los intentos de reinicio. De forma predeterminada, la interfaz de usuario muestra un mensaje antes de reiniciar el equipo. +/log log.txt: crea un registro en un archivo específico. De forma predeterminada, se crea un archivo de registro en %TEMP%. + &Cerrar + &Acepto los términos y condiciones de licencia + &Opciones + &Instalar + &Cerrar + Opciones de instalación + Ubicación de la instalación: + E&xaminar + &Aceptar + &Cancelar + Progreso de la instalación + Procesando: + Inicializando... + &Cancelar + Modificar instalación + &Reparar + &Desinstalar + &Cerrar + La reparación se completó correctamente + La desinstalación se completó correctamente + La instalación se realizó correctamente + La instalación o desinstalación se realizó correctamente + &Iniciar + Debe reiniciar el equipo para poder usar el software. + &Reiniciar + &Cerrar + Error de instalación + No se pudo instalar + No se pudo desinstalar + No se pudo reparar + Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el <a href="#">archivo de registro</a>. + Debe reiniciar el equipo para completar la reversión del software. + &Reiniciar + &Cerrar + [PRODUCT_NAME] no se admite en este sistema operativo. Para obtener más información, consulte [LINK_PREREQ_PAGE]. + [PRODUCT_NAME] no es compatible con los sistemas operativos x86. Instálelo con el instalador x86 correspondiente. + Archivos en uso + Las siguientes aplicaciones usan archivos que se deben actualizar: + Cerrar las &aplicaciones e intentar reiniciarlas. + &No cerrar las aplicaciones. Será necesario un reinicio. + &Aceptar + &Cancelar + Entorno de ejecución .NET + .NET Runtime se usa para ejecutar aplicaciones .NET en un equipo con Windows. Microsoft admite .NET, un código abierto multiplataforma. Esperamos que lo disfrute. + Más información sobre .NET + Lo siguiente se instaló en [DOTNETHOME] + - [BUNDLEMONIKER] + Recursos + <A HREF="https://aka.ms/dotnet-docs">Documentación</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Notas de la versión</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutoriales</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetría de .NET</A> + <A HREF="https://aka.ms/dev-privacy">Declaración de privacidad</A> + <A HREF="https://aka.ms/dotnet-license-windows">Información de licencias de .NET</A> + Al hacer clic en Instalar, acepta los términos siguientes. + From 0b541209aed8f397cce0539ce859dda759f84294 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:05:47 -0700 Subject: [PATCH 010/185] Update platform manifest entries to include linux/mac file variations from the runtime. --- .../Microsoft.NETCore.App/Directory.Build.props | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index 0dd75ec0b067c5..f6022ec5f9a424 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -93,11 +93,21 @@ + + + + + + + + + + @@ -308,6 +318,7 @@ + From 290d0faf8da785343771dffe18930cb2ccb98853 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:06:06 -0700 Subject: [PATCH 011/185] Update apphost pack to match master. --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj index 13f280a5f95b1b..24948f19fda500 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -22,6 +22,8 @@ + + From 2083c8525c3e363afb6c3f804d8bf5fa498cf975 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:06:12 -0700 Subject: [PATCH 012/185] Fix typo --- .../pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index aaa9232a5c6826..a03e5a2ebb940b 100644 --- a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -14,7 +14,7 @@ Runtime $(MSBuildProjectDirectory)/shared-framework-distribution-template.xml com.microsoft.dotnet.$(SharedFrameworkName).$(ProductVersion).osx.x64 - osx_resources + osx_resources From 49fbab6ab86891395956b4a202080b18a3024b04 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:06:30 -0700 Subject: [PATCH 013/185] Include manpages and fix linux package properties. --- src/installer/pkg/newsfx/installers/dotnet-host.proj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj index 4d837532f2d7b6..7fab081995bc2e 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-host.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-host.proj @@ -25,6 +25,10 @@ + + + + @@ -50,9 +54,9 @@ - - - + + + From 0c9b00cf3205f0a6d7ddd1c27766b0b33249659a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:06:40 -0700 Subject: [PATCH 014/185] Fix linux package properties. --- src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj index b0aaeeb3a3253b..4806a75c65b6e7 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj @@ -33,7 +33,7 @@ - + From 6dfa86876d8b7640d603086dcc677b2a7ec7c465 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:27:01 -0700 Subject: [PATCH 015/185] Match short-description from packages in master. --- src/installer/pkg/newsfx/installers/dotnet-host.proj | 1 + src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj index 7fab081995bc2e..fe37a2f69085b4 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-host.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-host.proj @@ -14,6 +14,7 @@ Dotnet_CLI_SharedHost HostSrc false + true sharedhost false osx_scripts/host diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj index 4806a75c65b6e7..598143af00669a 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj @@ -12,6 +12,7 @@ hostfxr Dotnet_CLI_HostFxr HostFxrSrc + true hostfxr osx_scripts/hostfxr From 63cdc70114497ce8918190c788d11d85053077e9 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 25 Jun 2020 14:54:32 -0700 Subject: [PATCH 016/185] Update to uploaded package. --- NuGet.config | 1 - global.json | 2 +- src/installer/pkg/newsfx/Directory.Build.props | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3c4daf0e465d6..bb5bf7e09ea68f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,6 @@ - diff --git a/global.json b/global.json index b3840bf23bff28..f0be656eab334c 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20316.1", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20325.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.7.20316.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/Directory.Build.props b/src/installer/pkg/newsfx/Directory.Build.props index 7f03fc5ee042d0..d9d130b2df7d37 100644 --- a/src/installer/pkg/newsfx/Directory.Build.props +++ b/src/installer/pkg/newsfx/Directory.Build.props @@ -20,9 +20,4 @@ - - - D:\source\arcade\artifacts\bin\Microsoft.DotNet.SharedFramework.Sdk\Debug\netcoreapp2.1\publish\ - D:\source\arcade\src\Microsoft.DotNet.SharedFramework.Sdk\targets\ - From 5c637d220712728ed29b9215848cf3c25f68876a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 26 Jun 2020 10:17:53 -0700 Subject: [PATCH 017/185] Update metadata and SDK to generate an exact match of the productbuild xml file. --- global.json | 2 +- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj | 1 + src/installer/pkg/newsfx/installers/dotnet-host.proj | 1 + src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index f0be656eab334c..57b9eca3119eac 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20316.1", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20325.2", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20326.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.7.20316.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 10d12f6febedda..0d61b49c3404ef 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -20,6 +20,7 @@ true true + The .NET Shared Framework diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj index fe37a2f69085b4..cdd1fad25fa861 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-host.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-host.proj @@ -18,6 +18,7 @@ sharedhost false osx_scripts/host + The .NET Shared Host. diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj index 598143af00669a..842564115d5ebb 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj @@ -15,6 +15,7 @@ true hostfxr osx_scripts/hostfxr + The .NET HostFxr From c8bd51ec0cf3d56693cb8e1ae766e9bb26df7dce Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 13 Jul 2020 10:38:15 -0700 Subject: [PATCH 018/185] First draft moving crossgen2 to new SDK. --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj new file mode 100644 index 00000000000000..281e8eba7951b7 --- /dev/null +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -0,0 +1,88 @@ + + + + + + RuntimePack + Microsoft.NETCore.App.Crossgen2 + dotnet-crossgen2 + win-x64;linux-x64;linux-musl-x64 + false + + AddRuntimeFilesToPackage; + AddFrameworkFilesToPackage + + true + false + + false + + + + unix + win + $(TargetOSComponent)-$(TargetArchitecture) + + + + + + + + + + + + + + + + + + + runtimes/$(RuntimeIdentifier)/native + + + + + + + + + + + + + + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + + + + + + + + + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + + + + + + + + + From 890dc74e352d2b99ec8dfaef237a560e618bc68b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 15 Jul 2020 12:11:53 -0700 Subject: [PATCH 019/185] Get crossgen2 pack working with updated SDK. --- global.json | 2 +- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 57b9eca3119eac..8c8392fadbcef1 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20316.1", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20316.1", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20326.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.7.20316.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index 281e8eba7951b7..c8bcdc052fa2df 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -6,6 +6,7 @@ RuntimePack Microsoft.NETCore.App.Crossgen2 dotnet-crossgen2 + crossgen2 win-x64;linux-x64;linux-musl-x64 false @@ -43,8 +44,7 @@ runtimes/$(RuntimeIdentifier)/native - - + From 98bb6c908be647bfb50511323ee409fc4425968d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 15 Jul 2020 15:03:46 -0700 Subject: [PATCH 020/185] Build archives from the installer and bundle projects. --- global.json | 2 +- .../bundle/Microsoft.NETCore.App.Bundle.bundleproj | 10 ++++++++++ src/installer/pkg/newsfx/installers/dotnet-host.proj | 1 + .../pkg/newsfx/installers/dotnet-hostfxr.proj | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 5e002a93a4bbfc..74afc5b749a4b5 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.7", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index a03e5a2ebb940b..27438a9b7db742 100644 --- a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -8,8 +8,10 @@ --> .NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) + ToolPack Microsoft.NETCore.App dotnet-runtime + true win-x86;win-x64;win-arm64;osx-x64 Runtime $(MSBuildProjectDirectory)/shared-framework-distribution-template.xml @@ -23,4 +25,12 @@ + + + + + + diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj index cdd1fad25fa861..354affe2727367 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-host.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-host.proj @@ -3,6 +3,7 @@ true + false dotnet-host dotnet-host-internal Host diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj index 842564115d5ebb..73b6f943eabfc1 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj @@ -3,6 +3,7 @@ true + dotnet-hostfxr-internal dotnet-hostfxr dotnet-hostfxr-internal Host FX Resolver From 4a0ecf07da20033e28928bef6f18b37727f1fea7 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 15 Jul 2020 15:56:36 -0700 Subject: [PATCH 021/185] Move the dotnet-runtime-deps installers to use the new SDK. --- global.json | 2 +- .../dotnet-runtime-deps/Directory.Build.props | 9 +++++++ .../Directory.Build.targets | 8 ++++++ .../dotnet-runtime-deps-centos.7.proj | 11 ++++++++ .../dotnet-runtime-deps-debian.proj | 25 +++++++++++++++++++ .../dotnet-runtime-deps-fedora.27.proj | 11 ++++++++ .../dotnet-runtime-deps-opensuse.42.proj | 11 ++++++++ .../dotnet-runtime-deps-oraclelinux.7.proj | 11 ++++++++ .../dotnet-runtime-deps-rhel.7.proj | 11 ++++++++ .../dotnet-runtime-deps-sles.12.proj | 11 ++++++++ 10 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj create mode 100644 src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj diff --git a/global.json b/global.json index 74afc5b749a4b5..7e1bffde906940 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.7", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.8", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props new file mode 100644 index 00000000000000..d64ba9a0db61fd --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + false + dotnet-runtime-deps + linux-$(TargetArchitecture) + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets new file mode 100644 index 00000000000000..c82d80e21599c5 --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj new file mode 100644 index 00000000000000..1b1495eaf9c642 --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj @@ -0,0 +1,11 @@ + + + + true + centos.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj new file mode 100644 index 00000000000000..0b608885b5fd83 --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj @@ -0,0 +1,25 @@ + + + + true + + + + + [ + "liblldb-3.5", + "liblldb-3.6" + ] + + + + + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj new file mode 100644 index 00000000000000..3d3dd247423113 --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj @@ -0,0 +1,11 @@ + + + + true + fedora.27 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj new file mode 100644 index 00000000000000..550088d61df03d --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj @@ -0,0 +1,11 @@ + + + + true + opensuse.42 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj new file mode 100644 index 00000000000000..c6b902fd178734 --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj @@ -0,0 +1,11 @@ + + + + true + oraclelinux.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj new file mode 100644 index 00000000000000..0106c2d6a56cfe --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj @@ -0,0 +1,11 @@ + + + + true + rhel.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj new file mode 100644 index 00000000000000..885715edd246fb --- /dev/null +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj @@ -0,0 +1,11 @@ + + + + true + sles.12 + + + + + + \ No newline at end of file From 3ac3696d945b3485eb1b0f46ec07ca6c0a508f93 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 15 Jul 2020 16:24:13 -0700 Subject: [PATCH 022/185] Rough attempt to convert the build to use the new sfx sdk. --- eng/pipelines/installer/jobs/base-job.yml | 61 +-- .../jobs/steps/build-linux-package.yml | 10 +- eng/pipelines/runtime-official.yml | 1 - .../pkg/packaging/Directory.Build.props | 20 - .../deb/dotnet-hostfxr-debian_config.json | 39 -- .../dotnet-runtime-deps-debian_config.json | 45 -- .../dotnet-sharedframework-debian_config.json | 39 -- .../deb/dotnet-sharedhost-debian_config.json | 45 -- src/installer/pkg/packaging/deb/package.props | 8 - .../pkg/packaging/deb/package.targets | 358 --------------- src/installer/pkg/packaging/installers.proj | 275 ----------- .../resources/cs.lproj/conclusion.html | 22 - .../hostfxr/resources/cs.lproj/welcome.html | 20 - .../resources/de.lproj/conclusion.html | 22 - .../hostfxr/resources/de.lproj/welcome.html | 20 - .../hostfxr/resources/dotnetbackground.png | Bin 4601 -> 0 bytes .../resources/en.lproj/conclusion.html | 22 - .../hostfxr/resources/en.lproj/welcome.html | 20 - .../resources/es.lproj/conclusion.html | 22 - .../hostfxr/resources/es.lproj/welcome.html | 20 - .../resources/fr.lproj/conclusion.html | 22 - .../hostfxr/resources/fr.lproj/welcome.html | 20 - .../resources/it.lproj/conclusion.html | 22 - .../hostfxr/resources/it.lproj/welcome.html | 20 - .../resources/ja.lproj/conclusion.html | 22 - .../hostfxr/resources/ja.lproj/welcome.html | 20 - .../resources/ko.lproj/conclusion.html | 22 - .../hostfxr/resources/ko.lproj/welcome.html | 20 - .../resources/pl.lproj/conclusion.html | 22 - .../hostfxr/resources/pl.lproj/welcome.html | 20 - .../resources/pt-br.lproj/conclusion.html | 22 - .../resources/pt-br.lproj/welcome.html | 20 - .../resources/ru.lproj/conclusion.html | 22 - .../hostfxr/resources/ru.lproj/welcome.html | 20 - .../resources/tr.lproj/conclusion.html | 22 - .../hostfxr/resources/tr.lproj/welcome.html | 20 - .../resources/zh-hans.lproj/conclusion.html | 22 - .../resources/zh-hans.lproj/welcome.html | 20 - .../resources/zh-hant.lproj/conclusion.html | 22 - .../resources/zh-hant.lproj/welcome.html | 20 - .../packaging/osx/hostfxr/scripts/postinstall | 16 - src/installer/pkg/packaging/osx/package.props | 6 - .../pkg/packaging/osx/package.targets | 103 ----- .../packaging/osx/resources/cs.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/de.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/en.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/es.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/fr.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/it.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/ja.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/ko.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/pl.lproj/eula.rtf | Bin 1291 -> 0 bytes .../osx/resources/pt-br.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/ru.lproj/eula.rtf | Bin 1291 -> 0 bytes .../packaging/osx/resources/tr.lproj/eula.rtf | Bin 1291 -> 0 bytes .../osx/resources/zh-hans.lproj/eula.rtf | Bin 1291 -> 0 bytes .../osx/resources/zh-hant.lproj/eula.rtf | Bin 1291 -> 0 bytes .../resources/cs.lproj/conclusion.html | 25 - .../resources/cs.lproj/welcome.html | 22 - .../resources/de.lproj/conclusion.html | 25 - .../resources/de.lproj/welcome.html | 22 - .../resources/dotnetbackground.png | Bin 4601 -> 0 bytes .../resources/en.lproj/conclusion.html | 24 - .../resources/en.lproj/welcome.html | 21 - .../resources/es.lproj/conclusion.html | 25 - .../resources/es.lproj/welcome.html | 22 - .../resources/fr.lproj/conclusion.html | 25 - .../resources/fr.lproj/welcome.html | 22 - .../resources/it.lproj/conclusion.html | 25 - .../resources/it.lproj/welcome.html | 22 - .../resources/ja.lproj/conclusion.html | 25 - .../resources/ja.lproj/welcome.html | 22 - .../resources/ko.lproj/conclusion.html | 25 - .../resources/ko.lproj/welcome.html | 22 - .../resources/pl.lproj/conclusion.html | 25 - .../resources/pl.lproj/welcome.html | 22 - .../resources/pt-br.lproj/conclusion.html | 25 - .../resources/pt-br.lproj/welcome.html | 22 - .../osx/sharedframework/scripts/postinstall | 13 - ...shared-framework-distribution-template.xml | 30 -- .../osx/sharedhost/scripts/postinstall | 18 - src/installer/pkg/packaging/pack-managed.proj | 24 - .../rpm/dotnet-hostfxr-rpm_config.json | 43 -- ...-runtime-deps-rpm_config_centos.7-x64.json | 44 -- ...runtime-deps-rpm_config_fedora.27-x64.json | 44 -- ...ntime-deps-rpm_config_opensuse.42-x64.json | 44 -- ...ime-deps-rpm_config_oraclelinux.7-x64.json | 44 -- ...et-runtime-deps-rpm_config_rhel.7-x64.json | 44 -- ...t-runtime-deps-rpm_config_sles.12-x64.json | 44 -- .../dotnet-sharedframework-rpm_config.json | 46 -- .../rpm/dotnet-sharedhost-rpm_config.json | 43 -- src/installer/pkg/packaging/rpm/package.props | 12 - .../pkg/packaging/rpm/package.targets | 434 ------------------ .../pkg/packaging/rpm/templates/changelog | 2 - .../pkg/packaging/rpm/templates/copyright | 8 - .../arm/dotnet-sdk-3.1/snap/snapcraft.yaml | 40 -- .../arm/dotnet-sdk-5.0/snap/snapcraft.yaml | 40 -- .../arm64/dotnet-sdk-5.0/snap/snapcraft.yaml | 40 -- .../dotnet-runtime-2.1/snap/snapcraft.yaml | 45 -- .../dotnet-runtime-3.0/snap/snapcraft.yaml | 45 -- .../dotnet-runtime-3.1/snap/snapcraft.yaml | 43 -- .../dotnet-runtime-5.0/snap/snapcraft.yaml | 43 -- .../snaps/dotnet-sdk-2.1/snap/snapcraft.yaml | 37 -- .../snaps/dotnet-sdk-3.1/snap/snapcraft.yaml | 36 -- .../snaps/dotnet-sdk-5.0/snap/snapcraft.yaml | 36 -- .../packaging/snaps/dotnet-sdk/dotnet-runtime | 17 - .../snaps/dotnet-sdk/snap/snapcraft.yaml | 36 -- src/installer/pkg/packaging/version_badge.svg | 16 - .../pkg/packaging/vs-insertion-packages.proj | 21 - .../Microsoft.NETCore.DotNetAppHost.pkgproj | 8 - .../Microsoft.NETCore.DotNetAppHost.props | 31 -- .../Microsoft.NETCore.DotNetHost.pkgproj | 41 -- .../Microsoft.NETCore.DotNetHost/host.wxs | 52 --- ...Microsoft.NETCore.DotNetHostPolicy.pkgproj | 8 +- .../Microsoft.NETCore.DotNetHostPolicy.props | 12 - ...crosoft.NETCore.DotNetHostResolver.pkgproj | 43 +- ...Microsoft.NETCore.DotNetHostResolver.props | 12 - .../projects/netcoreapp/Directory.Build.props | 27 -- .../netcoreapp/pkg/Directory.Build.props | 44 -- .../Microsoft.NETCore.App.Crossgen2.pkgproj | 99 ---- .../pkg/Microsoft.NETCore.App.Host.pkgproj | 33 -- .../pkg/Microsoft.NETCore.App.Ref.pkgproj | 11 - .../pkg/Microsoft.NETCore.App.Runtime.pkgproj | 16 - .../netcoreapp/pkg/PackageOverrides.txt | 164 ------- .../netcoreapp/pkg/crossgenRIDs.props | 18 - .../pkg/legacy/Directory.Build.props | 23 - .../Microsoft.NETCore.App.Internal.pkgproj | 28 -- .../pkg/legacy/Microsoft.NETCore.App.pkgproj | 14 - .../workaround/Microsoft.NETCore.App.pkgproj | 29 -- .../Microsoft.NETCore.App.Bundle.bundleproj | 21 - .../Microsoft.NETCore.App.SharedFx.sfxproj | 85 ---- .../pkg/projects/netcoreapp/sfx/bundle.thm | 114 ----- .../pkg/projects/netcoreapp/sfx/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1028/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1029/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1031/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1033/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1036/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1040/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1041/bundle.wxl | 75 --- .../netcoreapp/sfx/theme/1042/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1045/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1046/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1049/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/1055/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/2052/bundle.wxl | 74 --- .../netcoreapp/sfx/theme/3082/bundle.wxl | 74 --- .../src/localnetcoreapp.override.targets | 126 ----- .../netcoreapp/src/netcoreapp.depproj | 114 ----- .../netstandard/Directory.Build.props | 8 - .../netstandard/netstandardRIDs.props | 6 - .../netstandard/pkg/Directory.Build.props | 28 -- .../pkg/NETStandard.Library.Ref.pkgproj | 13 - .../netstandard/pkg/PackageOverrides.txt | 95 ---- .../netstandard/src/netstandard.depproj | 25 - 155 files changed, 25 insertions(+), 5948 deletions(-) delete mode 100644 src/installer/pkg/packaging/Directory.Build.props delete mode 100644 src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json delete mode 100644 src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json delete mode 100644 src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json delete mode 100644 src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json delete mode 100644 src/installer/pkg/packaging/deb/package.props delete mode 100644 src/installer/pkg/packaging/deb/package.targets delete mode 100644 src/installer/pkg/packaging/installers.proj delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html delete mode 100755 src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall delete mode 100644 src/installer/pkg/packaging/osx/package.props delete mode 100644 src/installer/pkg/packaging/osx/package.targets delete mode 100644 src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html delete mode 100755 src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall delete mode 100644 src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml delete mode 100755 src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall delete mode 100644 src/installer/pkg/packaging/pack-managed.proj delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json delete mode 100644 src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json delete mode 100644 src/installer/pkg/packaging/rpm/package.props delete mode 100644 src/installer/pkg/packaging/rpm/package.targets delete mode 100644 src/installer/pkg/packaging/rpm/templates/changelog delete mode 100644 src/installer/pkg/packaging/rpm/templates/copyright delete mode 100644 src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100755 src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime delete mode 100644 src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml delete mode 100644 src/installer/pkg/packaging/version_badge.svg delete mode 100644 src/installer/pkg/packaging/vs-insertion-packages.proj delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props delete mode 100644 src/installer/pkg/projects/netcoreapp/Directory.Build.props delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/bundle.thm delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl delete mode 100644 src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets delete mode 100644 src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj delete mode 100644 src/installer/pkg/projects/netstandard/Directory.Build.props delete mode 100644 src/installer/pkg/projects/netstandard/netstandardRIDs.props delete mode 100644 src/installer/pkg/projects/netstandard/pkg/Directory.Build.props delete mode 100644 src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj delete mode 100644 src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt delete mode 100644 src/installer/pkg/projects/netstandard/src/netstandard.depproj diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index b74bf18fb60ce6..e36339df239000 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -18,16 +18,11 @@ parameters: packageDistroList: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-debpkg-e5cf912-20175003025046 - imageRid: ubuntu.14.04 - rids: [] + packageType: deb + packagingArgs: /p:BuildDebPackage=true - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 - imageRid: rhel.7 - rids: - - centos.7 - - fedora.27 - - opensuse.42 - - oraclelinux.7 - - sles.12 + packageType: rpm + packagingArgs: /p:BuildRpmPackage=true isOfficialBuild: false useOfficialAllConfigurations: false @@ -114,7 +109,7 @@ jobs: - name: BaseJobBuildCommand value: >- - build.cmd -subset installer -ci + build.cmd -subset corehost+newsfx+installer.pkgprojs -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) @@ -132,7 +127,7 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset installer -ci + $(Build.SourcesDirectory)/build.sh -subset corehost+newsfx+installer.pkgprojs -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) @@ -243,7 +238,7 @@ jobs: $(PreserveNuGetAuthDockerArgs) - name: installersSubsetArg - value: --subset Installers + value: --subset newsfx - name: BaseJobBuildCommand value: | @@ -320,15 +315,6 @@ jobs: - name: LibrariesArtifactNameAllConfigurations value: libraries_bin_official_allconfigurations - # Download all upstream platforms and incorporate in the platform manifest. - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - name: AllArtifactsDownloadPath - value: 'artifacts/transport/AllArtifacts' - - name: AllArtifactsArgs - value: >- - /p:AllArtifactsDownloadPath=${{ parameters.buildCommandSourcesDirectory }}$(AllArtifactsDownloadPath) - /p:BuildFullPlatformManifest=true - dependsOn: - checkout - ${{ parameters.dependsOn }} @@ -348,10 +334,6 @@ jobs: parameters.liveLibrariesBuildConfig) }} - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - libraries_build_allconfigurations_Windows_NT_x64_Release - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }} - - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }} steps: @@ -403,23 +385,6 @@ jobs: libraries_bin_*/** !*Logs* - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - ${{ each platform in parameters.platforms }}: - - task: ExtractFiles@1 - displayName: 'Unzip $(runtimeFlavorName) artifacts: ${{ platform }}' - inputs: - archiveFilePatterns: | - $(Build.SourcesDirectory)/__download__/AllPlatforms/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}.* - destinationFolder: $(AllArtifactsDownloadPath)/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}/ - cleanUnpackFolder: false - - task: ExtractFiles@1 - displayName: 'Unzip Libraries artifacts: ${{ platform }}' - inputs: - archiveFilePatterns: | - $(Build.SourcesDirectory)/__download__/AllPlatforms/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}.* - destinationFolder: $(AllArtifactsDownloadPath)/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}/ - cleanUnpackFolder: false - - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: @@ -483,17 +448,7 @@ jobs: image: ${{ packageBuild.image }} packageStepDescription: Runtime Deps, Runtime, Framework Packs installers subsetArg: $(installersSubsetArg) - - - ${{ each rid in packageBuild.rids }}: - # Build distro-dependent packages. - - template: steps/build-linux-package.yml - parameters: - distroRid: ${{ rid }} - image: ${{ packageBuild.image }} - outputRidArg: /p:OutputRid=${{ rid }}-${{ parameters.archType }} - packageStepDescription: Runtime Deps installers - packagingArgs: /p:BuildDistroIndependentInstallers=false - subsetArg: $(installersSubsetArg) + packagingArgs: ${{ packageBuild.packagingArgs }} - ${{ if ne(parameters.container, '') }}: # Files may be owned by root because builds don't set user ID. Later build steps run 'find' in diff --git a/eng/pipelines/installer/jobs/steps/build-linux-package.yml b/eng/pipelines/installer/jobs/steps/build-linux-package.yml index e0129ccff6317c..86f165add3a141 100644 --- a/eng/pipelines/installer/jobs/steps/build-linux-package.yml +++ b/eng/pipelines/installer/jobs/steps/build-linux-package.yml @@ -1,7 +1,6 @@ parameters: - distroRid: null + packageType: null image: null - outputRidArg: '' packageStepDescription: null packagingArgs: '' subsetArg: '' @@ -13,12 +12,9 @@ steps: $(DockerRunMSBuild) ${{ parameters.image }} $(BuildScript) \ --ci \ ${{ parameters.subsetArg }} \ - /p:UsePrebuiltPortableBinariesForInstallers=true \ $(PackagePortableBitsArgs) \ - /p:GenerateProjectInstallers=true \ ${{ parameters.packagingArgs }} \ $(CommonMSBuildArgs) \ - ${{ parameters.outputRidArg }} \ $(LiveOverridePathArgs) \ - /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.distroRid }}.installers.binlog - displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.distroRid }} + /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog + displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.packageType }} diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 3d335e198d7d4f..4defeeef70b8fc 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -189,7 +189,6 @@ stages: liveLibrariesBuildConfig: Release isOfficialBuild: ${{ variables.isOfficialBuild }} useOfficialAllConfigurations: true - buildFullPlatformManifest: true platforms: - OSX_x64 - Linux_x64 diff --git a/src/installer/pkg/packaging/Directory.Build.props b/src/installer/pkg/packaging/Directory.Build.props deleted file mode 100644 index 61f4f4d515aa6f..00000000000000 --- a/src/installer/pkg/packaging/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - $(InstallerProjectRoot)pkg/packaging/ - - - $(BuildDistroIndependentInstallers) - $(BuildDistroIndependentInstallers) - - - $(IntermediateOutputRootPath)sharedHost/ - $(IntermediateOutputRootPath)hostFxr/ - $(IntermediateOutputRootPath)sharedFx/ - $(IntermediateOutputRootPath)combined-framework-host/ - $(IntermediateOutputRootPath)nethost/ - $(IntermediateOutputRootPath)crossgen2/ - - - diff --git a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json deleted file mode 100644 index ba7090e7ebb799..00000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%HOSTFXR_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%HOSTFXR_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "dotnet-host" : { - "package_version": "%SHARED_HOST_DEBIAN_VERSION%" - }, - "libc6":{}, - "libgcc1":{}, - "libstdc++6":{} - } -} diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json deleted file mode 100644 index ee2554263cf817..00000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "libc6":{}, - "libgcc1":{}, - "libgssapi-krb5-2":{}, - "libstdc++6":{}, - "zlib1g":{}, - "%SSL_DEPENDENCY_LIST%" : {}, - "%LIBICU_DEPENDENCY_LIST%": {} - }, - - "debian_ignored_dependencies" : [ - "liblldb-3.5", - "liblldb-3.6" - ] -} diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json deleted file mode 100644 index b2d78ab93be6dc..00000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_FRAMEWORK_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : { - "package_version": "%HOSTFXR_NUGET_VERSION%" - }, - "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : { - "package_version": "%RUNTIME_DEPS_VERSION%" - } - } -} diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json deleted file mode 100644 index dde2c2e3ac9ce7..00000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "dotnet-host", - "install_root": "/usr/share/dotnet", - - "short_description": "%SHARED_HOST_BRAND_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_HOST_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "libc6":{}, - "libgcc1":{}, - "libstdc++6":{} - }, - - "package_conflicts" : [ - "dotnet", - "dotnet-nightly" - ], - - "symlinks": { - "dotnet" : "/usr/bin/dotnet" - } -} diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props deleted file mode 100644 index 6ba97aaf680385..00000000000000 --- a/src/installer/pkg/packaging/deb/package.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(PackagingRoot)deb/ - dotnet-host - $(SharedHostDebPkgName.ToLower()) - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets deleted file mode 100644 index cea63af096a76b..00000000000000 --- a/src/installer/pkg/packaging/deb/package.targets +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - debian_config.json - - - - - - - - - - - $(SharedHostDebPkgName) - $(HostPackageVersion) - $(SharedHostPublishRoot) - $(SharedHostInstallerFile) - dotnet-sharedhost-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedHostBrandName) - - - $(HostPackageRelease) - - - - - - - - - - - - - - - - - - - - - - $(HostFxrDebPkgName) - $(HostResolverPackageVersion) - $(HostFxrPublishRoot) - $(HostFxrInstallerFile) - dotnet-hostfxr-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrBrandName) - - - $(HostPackageVersion) - - - $(HostResolverPackageVersion) - - - $(DebPackageName) - - - $(HostResolverPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - $(SharedFxDebPkgName) - $(RuntimePackageVersion) - $(SharedFrameworkPublishRoot) - $(SharedFrameworkInstallerFile) - dotnet-sharedframework-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrDebPkgName) - - - $(HostResolverPackageVersion) - - - $(SharedFxDebPkgName) - - - $(SharedFrameworkName) - - - $(RuntimePackageVersion) - - - $(SharedFrameworkBrandName) - - - $(RuntimeDependenciesDebPkgName) - - - $(RuntimeDepsDebPackageVersion) - - - $(RuntimePackageRelease) - - - - - - - - - - - - - - - - - - - - - - - $(RuntimeDependenciesDebPkgName) - $(RuntimeDepsDebPackageVersion) - $(DotnetRuntimeDependenciesPackageInstallerFile) - dotnet-runtime-deps-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - $(RuntimeDependenciesDebPkgName) - - - $(RuntimeDepsDebPackageVersion) - - - $(RuntimeDepsDebPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj deleted file mode 100644 index 2e81105f1a85fd..00000000000000 --- a/src/installer/pkg/packaging/installers.proj +++ /dev/null @@ -1,275 +0,0 @@ - - - - - true - - - - - - - GetInstallerLocations; - GenerateVersionBadge; - GenerateCompressedFiles; - GenerateInstallers; - GenerateProjectInstallers; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" /> - <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_NetHostOutputDir>$(ArtifactsBinDir)$(InstallerSourceOSPlatformConfig)\corehost\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(MSBuildThisFileDirectory)version_badge.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GeneratePkgs; - GenerateDebs; - GenerateRpms; - - - - - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png b/src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png deleted file mode 100644 index 16a6bf22ba789a0eb41ce25b92ba9915b2293af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4601 zcmeHKc~FyC693Rq6b4v^Lq{OE<7ga0R0au`z^EJw!>wH54wn!Jhuk4iDdoNtaJWY@ z2*?q_k;n~$NfZbXxeQ1m1Vlit1Ok`@HdFJ@RBhGP)=q8J*3`bL*RQ%?zh8HC_j}bZ z#m34^O5%hB002_guNm6`zyTxxh?O5XERwjC6{1CpScIL~6`+1dc~QiC;eXlkG5`>= zBn4iFMEudvYt9h>Al>)d6r-Z5d;mb^LFAV;qU zN*W*R4GVqdeW<$RUb4#lsIz0^vXTMf@ap_j6ZF@5Dv-f|>d|~F74bR;zIZ`3*3+V; zd1NuY>d+Otez?R@ycF_bCqK@^U}5!eew)R^l@QLrDz^v4D=mtk8!UwQaS9?8(KT%%v7&ihY{8yrk_p5^nuO+2rPK)|kw>ZriMY zmNTmKvMaYE>1%j@>T1)mxiwkf!Y$h`;GiHO1nkXS1~)?c)u3s_OXDEybI605`KsHr zU`_7MWE9UyQO8-!S3wKysm@zjrr)c*glM)b+jqi2vs!Wz*@Wn|{vl3LMlzJat92Rq zi5dVgu6~=$-*3md<18D*dVY10?}cfA!d4G$?YyTt7!%$+K4hh@mX}P8BF)nADw(Er zpo%vH)KYJ+1A3L^NTp0DH2thbMQkU44fk^9H7>o=WS6!tau?#MnI;wO$}(7P@AEC| z!`?p4+7#2ml9kr=#?s@eMP*q{Kbd$D4CK3;I~8jtXe_+@@8(%vL8K|$)x{JAC98}s zEhTSqTgI?vg9b*h03)|!5&mB~E=0LDj|EWrx0Vsk#M;ulW$!V{Sjoo%+U71dQYSy> zJobI=-D-pAl>m~O3bw(C z;cq=QL(yYK10$x6jt0(APl2~X=d-eIS8?-p;ls5Phx9&`eTW;SzV{0c?Hg+rFU(DoyIcM97nD8Kb0VC z_lmPAL4~$;QS_K=o8k-I`=xv~WS?`p*>87f>UKrAK5um~ErDM9>I2jmXPc}#&GSa; zoKCC#FnAtRH_k3B!m1IGQ*R4EUn{56rv=>_;Z=s*(jH`M#ji2%_$|T1)0)_LhVoa3 z?%Z!Vk{BF2N(IkW_5$0N5nvpXXZ^%DNFtFUO zgLHcj1Cl|*Af>6@vTbq`E8&~?T#~V)YuwhdH(z&4eKpeqo@-84&zxign9yz0&F9A+ zfBCA?zi@5+Wna+eVVc0kKYBZ;n}w#H02y=t z;wtrxUc4=k0^a}9aBaJx1wrnQLeKDo8*^9bz9S4jB78&cSg8^U19u#yWG&0Wfjg@G z-$)UYuRKw4OMtNRWjeDhwYXqC`aTm{#J*q2?F<0`aFU4)K@M|blrdEfadY)Hb(2$=2`vp(pywGs})xNoU?np9@H)O zHvsq$I4lmw>}CwlBXDKKvB`lr~+$n&jcn;ui zI#ksrcehom;7%ps&%#qJj6$t$Z}Chq(Utc@KeVEfx4Wf55MJGLj+XnGian?cwr zUG?R!A^A1a2LOx7hewF6xH7OP2<2HHxBD>^zL($RuKL&m z8`iO$buI-G@>4o#b{JxazTB~4iR1DO z8j+0i23%nb=WdDUk{~}7CtTvMU)^{~+BS=fiCy>{1^^?_R!>NtL`ml@Z1jK)Op6&? zUqjMAx4YFce7t68`N^;wE9TLQ;=q5ivjO_EjSkTvGR2;@XYwG^_X`;7{ zV`^CDbP(`s{5BElxEM(7YoDNi>#;tZlqg8tM5*G0ko-Vry*&H?@P^=%2qmF?^}9N7 zkTcSTCz9wVgp4$83Y^6;($I4$EUrGw1n$TMT^AMCk#Nso#}59zl&Y*xW$DC0al_cy zTnoA3Kn28R&$R_zk)E$eul`16Rfgq@ZYD1jc5}c~-vRY8mDSyPe8p6&$ep7q3xwW- z?w(jg4|hLT@7g5q#mwC$2nvw7vjPu>yuWa+v1&~8iU3x%bBRzRM3Z}vNhdSYA;_!V zHlIaQ>lRQ-w6UjLwq`yRMBU!1%dFXJ&@W`u{YJ{A0G+Uh(nR!{1B>H=)a?Yrgx6Xl zY#F8qukv7L6r^jbPII>2+NjXd_wINI+1jJS09F!a4l^Ka590e^8sq(@`jo8j!HLr* zz#Z}_hG!5=LgT^(d2L~&#vX6AZleHS3|eciHd1pVc*ajU;DgDc9@{wKyoyoVm?36*`M_dW1i2S?MTbKgqaD>`?!WrfdTJtK9nM+q(r&icGexzTN^~G z$vh2r-K?h(LJ+!XtwZXP-oomNoq^@jeo%%brZ>2rWbo1(#ozU(NR_=iffZEK!q_YD zOdUh?)UB|M)7F$1JEJ0Rf$v`(hPRJpGV=zS%tjmu$H{_xK=Y$(4h|i|M0ZsuQLEZ3 z6{w^(xj#UeO}xv6!_+%8f9WF?jlHtpVn|!NuB9U)X=cY=oQk2S{Q!z>IyhL zCz^Xi6}J$fLYs6_)_MI1y6};=G=DeB6AKN*CFw2i&T?Cj!gpEnfMU_1-AbXT3;Zx| z;fFxD5muT@HlBJ+gAijg&;89brIlS}-Q4i*=!GiZ8c>jUX^QUvrF^*d1(&aF25HbiF}HEvKuHKWte@kcro}Ee1~aQ;s?PTh7EJ`mBe4o=q@yQQb&Rem~wA16#1Gp6@UiSR*W4!-r zz&PsfM__=HlO#uG1$|g)Q4R?-G&~eaD*?cxFO+~EX8&sBPyY-4bAa{KEWn6#7^WMJ!IS7;87YDrUQLbq=&_AAS+k>(~=O>*=&z{4SfF5S<=N?`S zeBz9mY{8E&=y=HLkFWF2>D&t2ivxgo_)?N_1d}sls1bGLOzCHf_)FY?FuR_hd9ZlL zhY=q=FP{b^U#CcTLtipXzj!}xWtNY^Lqv_&g>NMQw;GE*+{&jO)3&2X;C0Iztc<8W zWWWt#z%Ru;hk@+y10ud(v - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7f..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96d..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

- - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall b/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall deleted file mode 100755 index 2d0ceb82786936..00000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -PACKAGE=$1 -INSTALL_DESTINATION=$2 - -# A temporary fix for the permissions issue(s) -chmod 755 $INSTALL_DESTINATION/dotnet - -# Add the installation directory to the system-wide paths -echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet - -exit 0 diff --git a/src/installer/pkg/packaging/osx/package.props b/src/installer/pkg/packaging/osx/package.props deleted file mode 100644 index 447ffe38c7efbf..00000000000000 --- a/src/installer/pkg/packaging/osx/package.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - $(PackagingRoot)osx/ - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets deleted file mode 100644 index 722676fffc1974..00000000000000 --- a/src/installer/pkg/packaging/osx/package.targets +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - $(SharedFxComponentId) - $(SharedFrameworkPublishRoot) - - $(PackagesIntermediateDir)$(SharedFxComponentId).pkg - $(SharedFrameworkInstallerFile) - - - $(SharedHostComponentId) - $(SharedHostPublishRoot) - - $(PackagesIntermediateDir)$(SharedHostComponentId).pkg - $(SharedHostInstallerFile) - - - $(HostFxrComponentId) - $(HostFxrPublishRoot) - - $(PackagesIntermediateDir)$(HostFxrComponentId).pkg - $(HostFxrInstallerFile) - - - - - /usr/local/share/dotnet - --version $(SharedFrameworkNugetVersion) --install-location $(InstallLocation) - - - - - - - - - $(OSXScriptRoot)sharedframework/ - $(PackagesIntermediateDir)resources - $(CombinedInstallerFile) - shared-framework-distribution-template.xml - $(PackagesIntermediateDir)$(TemplateFile) - - - - - - - - - - - - - - conclusion.html - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf b/src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf deleted file mode 100644 index 47d886627aea432bf12ee1f8ea70dd82253ab788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png b/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png deleted file mode 100644 index 16a6bf22ba789a0eb41ce25b92ba9915b2293af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4601 zcmeHKc~FyC693Rq6b4v^Lq{OE<7ga0R0au`z^EJw!>wH54wn!Jhuk4iDdoNtaJWY@ z2*?q_k;n~$NfZbXxeQ1m1Vlit1Ok`@HdFJ@RBhGP)=q8J*3`bL*RQ%?zh8HC_j}bZ z#m34^O5%hB002_guNm6`zyTxxh?O5XERwjC6{1CpScIL~6`+1dc~QiC;eXlkG5`>= zBn4iFMEudvYt9h>Al>)d6r-Z5d;mb^LFAV;qU zN*W*R4GVqdeW<$RUb4#lsIz0^vXTMf@ap_j6ZF@5Dv-f|>d|~F74bR;zIZ`3*3+V; zd1NuY>d+Otez?R@ycF_bCqK@^U}5!eew)R^l@QLrDz^v4D=mtk8!UwQaS9?8(KT%%v7&ihY{8yrk_p5^nuO+2rPK)|kw>ZriMY zmNTmKvMaYE>1%j@>T1)mxiwkf!Y$h`;GiHO1nkXS1~)?c)u3s_OXDEybI605`KsHr zU`_7MWE9UyQO8-!S3wKysm@zjrr)c*glM)b+jqi2vs!Wz*@Wn|{vl3LMlzJat92Rq zi5dVgu6~=$-*3md<18D*dVY10?}cfA!d4G$?YyTt7!%$+K4hh@mX}P8BF)nADw(Er zpo%vH)KYJ+1A3L^NTp0DH2thbMQkU44fk^9H7>o=WS6!tau?#MnI;wO$}(7P@AEC| z!`?p4+7#2ml9kr=#?s@eMP*q{Kbd$D4CK3;I~8jtXe_+@@8(%vL8K|$)x{JAC98}s zEhTSqTgI?vg9b*h03)|!5&mB~E=0LDj|EWrx0Vsk#M;ulW$!V{Sjoo%+U71dQYSy> zJobI=-D-pAl>m~O3bw(C z;cq=QL(yYK10$x6jt0(APl2~X=d-eIS8?-p;ls5Phx9&`eTW;SzV{0c?Hg+rFU(DoyIcM97nD8Kb0VC z_lmPAL4~$;QS_K=o8k-I`=xv~WS?`p*>87f>UKrAK5um~ErDM9>I2jmXPc}#&GSa; zoKCC#FnAtRH_k3B!m1IGQ*R4EUn{56rv=>_;Z=s*(jH`M#ji2%_$|T1)0)_LhVoa3 z?%Z!Vk{BF2N(IkW_5$0N5nvpXXZ^%DNFtFUO zgLHcj1Cl|*Af>6@vTbq`E8&~?T#~V)YuwhdH(z&4eKpeqo@-84&zxign9yz0&F9A+ zfBCA?zi@5+Wna+eVVc0kKYBZ;n}w#H02y=t z;wtrxUc4=k0^a}9aBaJx1wrnQLeKDo8*^9bz9S4jB78&cSg8^U19u#yWG&0Wfjg@G z-$)UYuRKw4OMtNRWjeDhwYXqC`aTm{#J*q2?F<0`aFU4)K@M|blrdEfadY)Hb(2$=2`vp(pywGs})xNoU?np9@H)O zHvsq$I4lmw>}CwlBXDKKvB`lr~+$n&jcn;ui zI#ksrcehom;7%ps&%#qJj6$t$Z}Chq(Utc@KeVEfx4Wf55MJGLj+XnGian?cwr zUG?R!A^A1a2LOx7hewF6xH7OP2<2HHxBD>^zL($RuKL&m z8`iO$buI-G@>4o#b{JxazTB~4iR1DO z8j+0i23%nb=WdDUk{~}7CtTvMU)^{~+BS=fiCy>{1^^?_R!>NtL`ml@Z1jK)Op6&? zUqjMAx4YFce7t68`N^;wE9TLQ;=q5ivjO_EjSkTvGR2;@XYwG^_X`;7{ zV`^CDbP(`s{5BElxEM(7YoDNi>#;tZlqg8tM5*G0ko-Vry*&H?@P^=%2qmF?^}9N7 zkTcSTCz9wVgp4$83Y^6;($I4$EUrGw1n$TMT^AMCk#Nso#}59zl&Y*xW$DC0al_cy zTnoA3Kn28R&$R_zk)E$eul`16Rfgq@ZYD1jc5}c~-vRY8mDSyPe8p6&$ep7q3xwW- z?w(jg4|hLT@7g5q#mwC$2nvw7vjPu>yuWa+v1&~8iU3x%bBRzRM3Z}vNhdSYA;_!V zHlIaQ>lRQ-w6UjLwq`yRMBU!1%dFXJ&@W`u{YJ{A0G+Uh(nR!{1B>H=)a?Yrgx6Xl zY#F8qukv7L6r^jbPII>2+NjXd_wINI+1jJS09F!a4l^Ka590e^8sq(@`jo8j!HLr* zz#Z}_hG!5=LgT^(d2L~&#vX6AZleHS3|eciHd1pVc*ajU;DgDc9@{wKyoyoVm?36*`M_dW1i2S?MTbKgqaD>`?!WrfdTJtK9nM+q(r&icGexzTN^~G z$vh2r-K?h(LJ+!XtwZXP-oomNoq^@jeo%%brZ>2rWbo1(#ozU(NR_=iffZEK!q_YD zOdUh?)UB|M)7F$1JEJ0Rf$v`(hPRJpGV=zS%tjmu$H{_xK=Y$(4h|i|M0ZsuQLEZ3 z6{w^(xj#UeO}xv6!_+%8f9WF?jlHtpVn|!NuB9U)X=cY=oQk2S{Q!z>IyhL zCz^Xi6}J$fLYs6_)_MI1y6};=G=DeB6AKN*CFw2i&T?Cj!gpEnfMU_1-AbXT3;Zx| z;fFxD5muT@HlBJ+gAijg&;89brIlS}-Q4i*=!GiZ8c>jUX^QUvrF^*d1(&aF25HbiF}HEvKuHKWte@kcro}Ee1~aQ;s?PTh7EJ`mBe4o=q@yQQb&Rem~wA16#1Gp6@UiSR*W4!-r zz&PsfM__=HlO#uG1$|g)Q4R?-G&~eaD*?cxFO+~EX8&sBPyY-4bAa{KEWn6#7^WMJ!IS7;87YDrUQLbq=&_AAS+k>(~=O>*=&z{4SfF5S<=N?`S zeBz9mY{8E&=y=HLkFWF2>D&t2ivxgo_)?N_1d}sls1bGLOzCHf_)FY?FuR_hd9ZlL zhY=q=FP{b^U#CcTLtipXzj!}xWtNY^Lqv_&g>NMQw;GE*+{&jO)3&2X;C0Iztc<8W zWWWt#z%Ru;hk@+y10ud(v - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html deleted file mode 100644 index c896f569d449c3..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html deleted file mode 100644 index e16c4b3148bcd4..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

The following was installed at /usr/local/share/dotnet -

    -
  • {SharedFxBrandName}
    • -
-
-
- - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html b/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html deleted file mode 100644 index 8c67baf86afba6..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -
-
-

.NET Runtime

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-
-
-

Learn more about .NET

- -
- - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall b/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall deleted file mode 100755 index 734abc33de6ec9..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -PACKAGE=$1 -INSTALL_DESTINATION=$2 - -# A temporary fix for the permissions issue(s) -chmod -R 755 $INSTALL_DESTINATION/shared - -exit 0 diff --git a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml deleted file mode 100644 index b910e9f83de2b9..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - {SharedFxBrandName} (x64) - - - - - - - - - - - - - - - - - - - - - - - - {SharedFxComponentId}.pkg - {HostFxrComponentId}.pkg - {SharedHostComponentId}.pkg - diff --git a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall b/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall deleted file mode 100755 index 531cb93fd382fc..00000000000000 --- a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -PACKAGE=$1 -INSTALL_DESTINATION=$2 - -# A temporary fix for the permissions issue(s) -chmod 755 $INSTALL_DESTINATION/dotnet - -# Add the installation directory to the system-wide paths -# But first create the directory if it doesn't exist -mkdir -p /etc/paths.d -echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet - -exit 0 diff --git a/src/installer/pkg/packaging/pack-managed.proj b/src/installer/pkg/packaging/pack-managed.proj deleted file mode 100644 index acefdfff86d103..00000000000000 --- a/src/installer/pkg/packaging/pack-managed.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - $(NetCoreAppCurrent) - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json deleted file mode 100644 index 2b2d08b4f29e7f..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - "install_doc": "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%/", - - "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%HOSTFXR_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies": [{ - "package_name": "dotnet-host", - "package_version": "%SHARED_HOST_RPM_VERSION%" - }], - - "directories" : [ - "/usr/share/dotnet/host", - "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%" - ] -} \ No newline at end of file diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json deleted file mode 100644 index 2ab384b5923d7a..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json deleted file mode 100644 index fb1c925c70648f..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "compat-openssl10", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json deleted file mode 100644 index 1c208459b79dd6..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "libopenssl1_0_0", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json deleted file mode 100644 index 2ab384b5923d7a..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json deleted file mode 100644 index 2ab384b5923d7a..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json deleted file mode 100644 index fc854bb6c957d4..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "libopenssl1_1", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json deleted file mode 100644 index e41d25617c87f0..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - "install_doc": "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%/", - - "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_FRAMEWORK_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies": [{ - "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", - "package_version": "%HOSTFXR_NUGET_VERSION%" - }, - { - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "package_version": "%RUNTIME_DEPS_VERSION%" - }], - - "directories" : [ - "/usr/share/dotnet/shared", - "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%" - ] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json deleted file mode 100644 index e443287e6594fe..00000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "dotnet-host", - "install_root": "/", - "install_doc": "/usr/share/doc/dotnet-host/", - "install_man": "/usr/share/man/man1", - - "short_description": "%SHARED_HOST_BRAND_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_HOST_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "package_conflicts" : [ - "dotnet", - "dotnet-nightly" - ], - - "directories" : [ - "/usr/share/dotnet", - "/usr/share/doc/dotnet-host" - ] -} diff --git a/src/installer/pkg/packaging/rpm/package.props b/src/installer/pkg/packaging/rpm/package.props deleted file mode 100644 index 90ab81b71917a2..00000000000000 --- a/src/installer/pkg/packaging/rpm/package.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - rpm_config.json - $(PackagingRoot)rpm/ - dotnet-host - $(SharedHostRpmPkgName.ToLower()) - - $(RpmTemplatesDir) - $(MSBuildThisFileDirectory)/scripts - - diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets deleted file mode 100644 index 85cbbb5795fa68..00000000000000 --- a/src/installer/pkg/packaging/rpm/package.targets +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - - - - - - $(SharedHostRpmPkgName) - $(HostPackageVersion) - $(SharedHostPublishRoot) - $(SharedHostInstallerFile) - dotnet-sharedhost-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - usr/share/dotnet/ - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root/ - $(rpmLayoutPackageRoot)$(UsrShareDotnetPath) - $(rpmLayoutPackageRoot)usr/bin/ - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedHostBrandName) - - - $(HostPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrRpmPkgName) - $(HostResolverPackageVersion) - $(HostFxrPublishRoot) - $(HostFxrInstallerFile) - dotnet-hostfxr-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrBrandName) - - - $(HostPackageVersion) - - - $(HostResolverPackageVersion) - - - $(RpmPackageName) - - - $(HostResolverPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedFxRpmPkgName) - $(RuntimePackageVersion) - $(SharedFrameworkPublishRoot) - $(SharedFrameworkInstallerFile) - dotnet-sharedframework-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrRpmPkgName) - - - $(HostResolverPackageVersion) - - - $(RuntimeDependenciesRpmPkgName) - - - $(RuntimeDepsRpmPackageVersion) - - - $(SharedFxRpmPkgName) - - - $(SharedFrameworkName) - - - $(RuntimePackageVersion) - - - $(SharedFrameworkBrandName) - - - $(RuntimePackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - rpmPackagingConfigPath=$(rpmPackagingConfigPath); - DotnetRuntimeDependenciesPackageInstallerFile=$(DotnetRuntimeDependenciesPackageInstallerFile); - OutputRid=$(OutputRid); - RuntimeDependenciesRpmPkgName=$(RuntimeDependenciesRpmPkgName); - RuntimeDepsRpmPackageVersion=$(RuntimeDepsRpmPackageVersion); - RuntimeDepsRpmPackageRelease=$(RuntimeDepsRpmPackageRelease); - TemplatesDir=$(TemplatesDir) - - dotnet-runtime-deps-rpm_config_ - - - - - - DepsRid=$(OutputRid);$(SharedProperties) - - - - - - - - - DepsRid=%(Rids.Identity);$(SharedProperties) - - - - - - - - - - $([System.String]::Copy('$(DotnetRuntimeDependenciesPackageInstallerFile)').Replace('$(OutputRid)', '$(DepsRid)')) - $(RuntimeDependenciesRpmPkgName) - $(RuntimeDepsRpmPackageVersion) - dotnet-runtime-deps-rpm_config_$(DepsRid).json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(RpmLayoutDirectory)package_root - $(RpmLayoutDirectory)docs - $(RpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - - $(RpmPackageName) - - - $(RuntimeDepsRpmPackageVersion) - - - $(RuntimeDepsRpmPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/rpm/templates/changelog b/src/installer/pkg/packaging/rpm/templates/changelog deleted file mode 100644 index e61dbc607cb807..00000000000000 --- a/src/installer/pkg/packaging/rpm/templates/changelog +++ /dev/null @@ -1,2 +0,0 @@ -* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> - {PACKAGE_VERSION}-{PACKAGE_REVISION} -- {CHANGELOG_MESSAGE} diff --git a/src/installer/pkg/packaging/rpm/templates/copyright b/src/installer/pkg/packaging/rpm/templates/copyright deleted file mode 100644 index a44f2cbd65168a..00000000000000 --- a/src/installer/pkg/packaging/rpm/templates/copyright +++ /dev/null @@ -1,8 +0,0 @@ -Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. - -Files: * -Copyright: {COPYRIGHT_TEXT} -License: {LICENSE_NAME} - -License: {LICENSE_NAME} - {LICENSE_TEXT} diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100644 index b9d9593496a844..00000000000000 --- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 3.1.201 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/ccbcbf70-9911-40b1-a8cf-e018a13e720e/03c0621c6510f9c6f4cca6951f2cc1a4/dotnet-sdk-3.1.201-linux-arm.tar.gz - source-checksum: sha512/f37d0e55c9f593c6951bea5a6bb1ea3194486956efe08a2a0f266b419d912cdcbf4ac279358976f0bfa1fe560c333ca5d5437f8e8c718bb5963991e4395e0cd7 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index c9e2ab7efb6c28..00000000000000 --- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index 94a9af147619cd..00000000000000 --- a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [arm64] - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml deleted file mode 100644 index bfd43ef2e99346..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: dotnet-runtime-21 -base: core18 -version: 2.1.15 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-21 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/d2fb0b54-01ce-452c-b2a2-86dbef286265/055ad7740827cbe862d14ceb7ea54fac/dotnet-runtime-2.1.15-linux-x64.tar.gz - source-checksum: sha512/cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml deleted file mode 100644 index 9276af3d01f022..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: dotnet-runtime-30 -base: core18 -version: 3.0.2 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-30 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/7647815e-9c28-40a5-96ea-c6ac4ebe2020/c026b1e93a5d6750a7666d3fe36a87f5/dotnet-runtime-3.0.2-linux-x64.tar.gz - source-checksum: sha512/c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml deleted file mode 100644 index a81092e3026fd3..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: dotnet-runtime-31 -base: core18 -version: 3.1.1 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-31 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/e060c2eb-1476-4d70-857c-24f5eead2070/ff0e007b7373c04f754b3818ffdb2134/dotnet-runtime-3.1.1-linux-x64.tar.gz - source-checksum: sha512/991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml deleted file mode 100644 index 8dd11b75f409fd..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: dotnet-runtime-50 -base: core18 -version: 5.0.0-preview.2.20167.3 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-50 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/169871b7-ce8f-4518-a342-209f98342569/4bb2abeecf4b064eac907fb28f96b5ca/aspnetcore-runtime-5.0.0-preview.2.20167.3-linux-x64.tar.gz - source-checksum: sha512/c155a94b463020f413b9cc6650219b27c08f331f9d1926966e4c4471b1a3cc79e199fbbd4747e8ad89bd03d66cd90cbc68a5554c54e931ac59f7508810303327 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml deleted file mode 100644 index 66a40385f282ec..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: dotnet-sdk -version: 2.1.804 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/9ba4d9b0-3fca-40ed-b5a2-1552dfa4f89e/8e5e555b543a7afd8fd764e080d25671/dotnet-sdk-2.1.804-linux-x64.tar.gz - source-checksum: sha512/82b039856dadd2b47fa56a262d1a1a389132f0db037d4ee5c0872f2949c2cd447c33a978e1f532783119aa416860e03f26b840863ca3a97392a4b77f8df5bf66 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - lldb - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100644 index c5b5b1371f2948..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 3.1.200 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/daec2daf-b458-4ae1-9046-b8ba09b5fb49/733e2d73b41640d6e6bdf1cc6b9ef03b/dotnet-sdk-3.1.200-linux-x64.tar.gz - source-checksum: sha512/5b9398c7bfe7f67cd9f38fdd4e6e429e1b6aaac0fe04672be0f8dca26580fb46906fd1d2deea6a7d3fb07d77e898f067d3ac1805fe077dc7c1adf9515c9bc9a9 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index 02eaa69deef59b..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/727a5825-d29a-4f45-beaa-053399f8b5ee/5f15827ceb4851ef87a008f5de0acf6c/dotnet-sdk-5.0.100-preview.2.20176.6-linux-x64.tar.gz - source-checksum: sha512/fface8ff5facdec10d11f8249b426a71cd5bc17aa4e4b1fbe85f4a462e55bdb648a456973a3257f0a700be1aeb0f9bb41639ceca12c2e67d1571e4544ae62bd7 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime deleted file mode 100755 index 31ac85be705436..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -dotnet_runtime_snaps=$(ls "$SNAP/../.." | grep dotnet-runtime) - -for snap in "$dotnet_runtime_snaps" -do - runtime_dir=$(realpath "$SNAP/../../$snap/current/shared/Microsoft.NETCore.App") - if [ -d "$runtime_dir" ]; then - runtime_version=$(ls "$runtime_dir") - runtime_path="$SNAP_DATA/Microsoft.NETCore.App/$runtime_version" - if [ ! -d "$runtime_path" ]; then - sudo ln -s "$runtime_dir/$runtime_version" "$runtime_path" - fi - fi -done - -exec $SNAP/dotnet "$@" diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml deleted file mode 100644 index 8f9c7cc3fe823c..00000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: $(DOTNET_SDK_VERSION) -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: devel -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: $(SOURCE_TARGZ) - source-checksum: sha512/$(SOURCE_TARGZ_SHA) - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - runtime-wrapper: - plugin: dump - source: . diff --git a/src/installer/pkg/packaging/version_badge.svg b/src/installer/pkg/packaging/version_badge.svg deleted file mode 100644 index 956523b78df3cf..00000000000000 --- a/src/installer/pkg/packaging/version_badge.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - version - version - ver_number - ver_number - - diff --git a/src/installer/pkg/packaging/vs-insertion-packages.proj b/src/installer/pkg/packaging/vs-insertion-packages.proj deleted file mode 100644 index fd69aea557f755..00000000000000 --- a/src/installer/pkg/packaging/vs-insertion-packages.proj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - $(NetCoreAppCurrent) - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj deleted file mode 100644 index a363542fa62517..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj +++ /dev/null @@ -1,8 +0,0 @@ - - - AppHostVersion - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props deleted file mode 100644 index abf841cbd26e72..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj index 7de9341dc42a2e..50aa1919abb0c5 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -4,50 +4,9 @@ HostVersion dotnet-host - true true - - - $(SharedHostBrandName) - sharedhost - Dotnet_CLI_SharedHost - SharedHost - - $(IntermediateOutputPath)publishRoot/ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs deleted file mode 100644 index 773246beb70f1a..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj index ccca328154d667..203b5dcaebef3e 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj @@ -9,5 +9,11 @@ - + + + + runtimes/$(PackageTargetRuntime)/native + true + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props deleted file mode 100644 index 6b1b70b6c20636..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj index bb16d54c5bce20..58653556eef241 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj @@ -4,7 +4,6 @@ HostResolverVersion dotnet-hostfxr - true true @@ -12,40 +11,12 @@ - - - $(HostFxrBrandName) - hostfxr - Dotnet_CLI_HostFxr - HostFXR - - $(IntermediateOutputPath)publishRoot/ - - - - - - - - - - - - - - - - + + + + runtimes/$(PackageTargetRuntime)/native + true + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props deleted file mode 100644 index 81d8d72da34c97..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/netcoreapp/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/Directory.Build.props deleted file mode 100644 index 63ce1c404aba09..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/Directory.Build.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - Windows_NT - Linux - OSX - iOS - tvOS - Android - Browser - FreeBSD - NetBSD - illumos - Solaris - $(CoreCLRTargetOS) - - - - dotnet - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props deleted file mode 100644 index 39b2cdc97461bb..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props +++ /dev/null @@ -1,44 +0,0 @@ - - - true - - - - - - $(NetCoreAppCurrentBrandName) - $(NetCoreAppCurrentIdentifier) - $(NetCoreAppCurrentVersion) - $(SharedFrameworkName) - - - - - - - - - - - - - - - - - - - - - - - - - - - RuntimeIdentifier=$(PackageTargetRuntime) - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj deleted file mode 100644 index 08933b1336529e..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - crossgen2 - true - true - - - - - - $(ShortFrameworkName)-crossgen2-pack - $(Crossgen2PackBrandName) - Crossgen2Pack - - - - - $(MSBuildThisFileDirectory)crossgenRIDs.props - - - - - - - - - - - - - unix - win - $(TargetOSComponent)-$(TargetArchitecture) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tools - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj deleted file mode 100644 index 8daa78d3ec7112..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - true - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj deleted file mode 100644 index 450e84155921a4..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - true - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj deleted file mode 100644 index 8d64fb1fc1aca4..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - true - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt b/src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt deleted file mode 100644 index c4c594f90f86d7..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt +++ /dev/null @@ -1,164 +0,0 @@ -Microsoft.CSharp|4.4.0 -Microsoft.Win32.Primitives|4.3.0 -Microsoft.Win32.Registry|4.4.0 -runtime.debian.8-x64.runtime.native.System|4.3.0 -runtime.debian.8-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.debian.8-x64.runtime.native.System.Net.Http|4.3.0 -runtime.debian.8-x64.runtime.native.System.Net.Security|4.3.0 -runtime.debian.8-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.fedora.23-x64.runtime.native.System|4.3.0 -runtime.fedora.23-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.fedora.23-x64.runtime.native.System.Net.Http|4.3.0 -runtime.fedora.23-x64.runtime.native.System.Net.Security|4.3.0 -runtime.fedora.23-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.fedora.24-x64.runtime.native.System|4.3.0 -runtime.fedora.24-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.fedora.24-x64.runtime.native.System.Net.Http|4.3.0 -runtime.fedora.24-x64.runtime.native.System.Net.Security|4.3.0 -runtime.fedora.24-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System.Net.Http|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System.Net.Security|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System.Net.Http|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System.Net.Security|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.osx.10.10-x64.runtime.native.System|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.Net.Http|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.Net.Security|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple|4.3.0 -runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.rhel.7-x64.runtime.native.System|4.3.0 -runtime.rhel.7-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.rhel.7-x64.runtime.native.System.Net.Http|4.3.0 -runtime.rhel.7-x64.runtime.native.System.Net.Security|4.3.0 -runtime.rhel.7-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography|4.3.0 -runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.0 -System.AppContext|4.3.0 -System.Buffers|4.4.0 -System.Collections|4.3.0 -System.Collections.Concurrent|4.3.0 -System.Collections.Immutable|1.4.0 -System.Collections.NonGeneric|4.3.0 -System.Collections.Specialized|4.3.0 -System.ComponentModel|4.3.0 -System.ComponentModel.EventBasedAsync|4.3.0 -System.ComponentModel.Primitives|4.3.0 -System.ComponentModel.TypeConverter|4.3.0 -System.Console|4.3.0 -System.Data.Common|4.3.0 -System.Diagnostics.Contracts|4.3.0 -System.Diagnostics.Debug|4.3.0 -System.Diagnostics.DiagnosticSource|4.4.0 -System.Diagnostics.FileVersionInfo|4.3.0 -System.Diagnostics.Process|4.3.0 -System.Diagnostics.StackTrace|4.3.0 -System.Diagnostics.TextWriterTraceListener|4.3.0 -System.Diagnostics.Tools|4.3.0 -System.Diagnostics.TraceSource|4.3.0 -System.Diagnostics.Tracing|4.3.0 -System.Dynamic.Runtime|4.3.0 -System.Globalization|4.3.0 -System.Globalization.Calendars|4.3.0 -System.Globalization.Extensions|4.3.0 -System.IO|4.3.0 -System.IO.Compression|4.3.0 -System.IO.Compression.ZipFile|4.3.0 -System.IO.FileSystem|4.3.0 -System.IO.FileSystem.AccessControl|4.4.0 -System.IO.FileSystem.DriveInfo|4.3.0 -System.IO.FileSystem.Primitives|4.3.0 -System.IO.FileSystem.Watcher|4.3.0 -System.IO.IsolatedStorage|4.3.0 -System.IO.MemoryMappedFiles|4.3.0 -System.IO.Pipes|4.3.0 -System.IO.UnmanagedMemoryStream|4.3.0 -System.Linq|4.3.0 -System.Linq.Expressions|4.3.0 -System.Linq.Queryable|4.3.0 -System.Net.Http|4.3.0 -System.Net.NameResolution|4.3.0 -System.Net.Primitives|4.3.0 -System.Net.Requests|4.3.0 -System.Net.Security|4.3.0 -System.Net.Sockets|4.3.0 -System.Net.WebHeaderCollection|4.3.0 -System.ObjectModel|4.3.0 -System.Private.DataContractSerialization|4.3.0 -System.Reflection|4.3.0 -System.Reflection.Emit|4.3.0 -System.Reflection.Emit.ILGeneration|4.3.0 -System.Reflection.Emit.Lightweight|4.3.0 -System.Reflection.Extensions|4.3.0 -System.Reflection.Metadata|1.5.0 -System.Reflection.Primitives|4.3.0 -System.Reflection.TypeExtensions|4.3.0 -System.Resources.ResourceManager|4.3.0 -System.Runtime|4.3.0 -System.Runtime.Extensions|4.3.0 -System.Runtime.Handles|4.3.0 -System.Runtime.InteropServices|4.3.0 -System.Runtime.InteropServices.RuntimeInformation|4.3.0 -System.Runtime.Loader|4.3.0 -System.Runtime.Numerics|4.3.0 -System.Runtime.Serialization.Formatters|4.3.0 -System.Runtime.Serialization.Json|4.3.0 -System.Runtime.Serialization.Primitives|4.3.0 -System.Security.AccessControl|4.4.0 -System.Security.Claims|4.3.0 -System.Security.Cryptography.Algorithms|4.3.0 -System.Security.Cryptography.Cng|4.4.0 -System.Security.Cryptography.Csp|4.3.0 -System.Security.Cryptography.Encoding|4.3.0 -System.Security.Cryptography.OpenSsl|4.4.0 -System.Security.Cryptography.Primitives|4.3.0 -System.Security.Cryptography.X509Certificates|4.3.0 -System.Security.Cryptography.Xml|4.4.0 -System.Security.Principal|4.3.0 -System.Security.Principal.Windows|4.4.0 -System.Text.Encoding|4.3.0 -System.Text.Encoding.Extensions|4.3.0 -System.Text.RegularExpressions|4.3.0 -System.Threading|4.3.0 -System.Threading.Overlapped|4.3.0 -System.Threading.Tasks|4.3.0 -System.Threading.Tasks.Extensions|4.3.0 -System.Threading.Tasks.Parallel|4.3.0 -System.Threading.Thread|4.3.0 -System.Threading.ThreadPool|4.3.0 -System.Threading.Timer|4.3.0 -System.ValueTuple|4.3.0 -System.Xml.ReaderWriter|4.3.0 -System.Xml.XDocument|4.3.0 -System.Xml.XmlDocument|4.3.0 -System.Xml.XmlSerializer|4.3.0 -System.Xml.XPath|4.3.0 -System.Xml.XPath.XDocument|4.3.0 diff --git a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props b/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props deleted file mode 100644 index f10ef9947ce63e..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - false - - - - $(OutputRid) - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props deleted file mode 100644 index 03473f6c66f5bb..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - true - build/$(NetCoreAppCurrent)/ - - false - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj deleted file mode 100644 index a46f80401902f5..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)Microsoft.NETCore.App.pkgproj - true - - - - - - - false - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj deleted file mode 100644 index 4ca074396a5380..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - false - - data/ - true - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj deleted file mode 100644 index d5ae432d189a4b..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - true - - - - - - - false - false - - - true - - false - - false - true - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj deleted file mode 100644 index b7c0b133861569..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - .NET Core Shared Framework Bundle Installer - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj deleted file mode 100644 index f1aab81eb8a4b8..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Microsoft.NETCore.App - $(SfxIdentity).Internal - - - $(SharedFrameworkPublishDir) - - true - - - true - true - - - false - - - - - - - - - - - - - - - $(SharedFrameworkInstallerFile) - - - - - - - - - - - - - - - - - - - - - - - - - - $(RestoreSources);$(LibrariesShippingPackagesDir) - $(RestoreSources);$(LibrariesNonShippingPackagesDir) - - - - $(RestoreSources);$(LibrariesAllConfigShippingPackagesDir) - $(RestoreSources);$(LibrariesAllConfigNonShippingPackagesDir) - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.thm b/src/installer/pkg/projects/netcoreapp/sfx/bundle.thm deleted file mode 100644 index 845b5cbd2caf0e..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/bundle.thm +++ /dev/null @@ -1,114 +0,0 @@ - - - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - #(loc.Title) - - - - - #(loc.HelpHeader) - #(loc.HelpText) - - - - - - - - - #(loc.WelcomeHeaderMessage) - #(loc.WelcomeDescription) - #(loc.LicenseAssent) - #(loc.PrivacyStatementLink) - #(loc.EulaLink) - - - - - - - - #(loc.OptionsHeader) - #(loc.OptionsLocationLabel) - - - - - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - - - - - - - - - - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - - - - #(loc.ModifyHeader) - - - - - - - - - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - #(loc.SuccessInstallLocation) - #(loc.SuccessInstallProductName) - #(loc.ResourcesHeader) - #(loc.DocumentationLink) - #(loc.RelaseNotesLink) - #(loc.TutorialLink) - #(loc.TelemetryLink) - - - - - - - - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl deleted file mode 100644 index 5523036197cf03..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] Installer - [BUNDLEMONIKER] - You just need a shell, a text editor and 10 minutes of your time. - -Ready? Set? Let's go! - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - I &agree to the license terms and conditions - &Options - &Install - &Close - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation was successful - Setup Successful - &Launch - You must restart your computer before you can use the software. - &Restart - &Close - Setup Failed - Setup Failed - Uninstall Failed - Repair Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - The [PRODUCT_NAME] is not supported on this operating system. For more information, see [LINK_PREREQ_PAGE]. - The [PRODUCT_NAME] isn't supported on x86 operating systems. Please install using the corresponding x86 installer. - Files In Use - The following applications are using files that need to be updated: - Close the &applications and attempt to restart them. - &Do not close applications. A reboot will be required. - &OK - &Cancel - .NET Runtime - The .NET Runtime is used to run .NET applications, on your Windows computer. .NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! - Learn more about .NET - The following was installed at [DOTNETHOME] - - [BUNDLEMONIKER] - Resources - <A HREF="https://aka.ms/dotnet-docs">Documentation</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Release Notes</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetry</A> - <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> - <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> - By clicking Install, you agree to the following terms. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl deleted file mode 100644 index e44840f4b1ede4..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] 安裝程式 - [BUNDLEMONIKER] - 您只需要殼層、文字編輯器和 10 分鐘的時間。 - -準備好了嗎? 讓我們開始吧! - 您確定要取消嗎? - 前一版 - 安裝程式說明 - /install | /repair | /uninstall | /layout [directory] - 在目錄中安裝、修復、解除安裝或 - 建立搭售方案的完整本機複本。預設為安裝。 - -/passive | /quiet - 顯示最少 UI 且不含提示，或者不顯示 UI，也 - 不顯示提示。預設會顯示 UI 和所有提示。 - -/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 -/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 - 關閉(&C) - 我同意授權條款及條件(&A) - 選項(&O) - 安裝(&I) - 關閉(&C) - 安裝選項 - 安裝位置: - 瀏覽(&B) - 確定(&O) - 取消(&C) - 安裝進度 - 處理中: - 正在初始化... - 取消(&C) - 修改安裝 - 修復(&R) - 解除安裝(&U) - 關閉(&C) - 修復已成功完成 - 解除安裝已成功完成 - 安裝成功 - 設定成功 - 啟動(&L) - 必須重新啟動電腦，才能使用此軟體。 - 重新啟動(&R) - 關閉(&C) - 設定失敗 - 安裝程式失敗 - 解除安裝失敗 - 修復失敗 - 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 - 重新啟動(&R) - 關閉(&C) - 此作業系統不支援 [PRODUCT_NAME]。如需詳細資訊，請參閱 [LINK_PREREQ_PAGE]。 - x86 作業系統不支援 [PRODUCT_NAME]。請使用對應的 x86 安裝程式來安裝。 - 使用中的檔案 - 以下應用程式正在使用需要進行更新的檔案: - 關閉應用程式並嘗試重新啟動(&A) - 不關閉應用程式，需要重新啟動(&D) - 確定(&O) - 取消(&C) - .NET Runtime - .NET Runtime 可用於在您的 Windows 電腦上執行 .NET 應用程式。.NET 為開放原始碼形式，且可跨平台運作，同時受到 Microsoft 支援。希望您會喜歡! - 深入了解 .NET - 下列項目已安裝在 [DOTNETHOME] - - [BUNDLEMONIKER] - 資源 - <A HREF="https://aka.ms/dotnet-docs">文件</A> - <A HREF="https://aka.ms/20-p2-rel-notes">版本資訊</A> - <A HREF="https://aka.ms/dotnet-tutorials">教學課程</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 遙測</A> - <A HREF="https://aka.ms/dev-privacy">隱私權聲明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET 的授權資訊</A> - 按一下 [\[]安裝[\[] 即表示您同意下列條款。 - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl deleted file mode 100644 index 4830781cfddc2b..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Instalační program pro [WixBundleName] - [BUNDLEMONIKER] - Potřebujete jenom prostředí, textový editor a 10 minut času. - -Jste připraveni? Dejme se tedy do toho! - Opravdu chcete akci zrušit? - Předchozí verze - Nápověda k instalaci - /install | /repair | /uninstall | /layout [adresář] – Nainstaluje, opraví, odinstaluje nebo - vytvoří úplnou místní kopii svazku v adresáři. Výchozí možností je instalace. - -/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a - žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev. - -/norestart – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu. -/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%. - &Zavřít - &Souhlasím s licenčními podmínkami - &Možnosti - &Nainstalovat - &Zavřít - Možnosti nastavení - Umístění instalace: - &Procházet - &OK - &Storno - Průběh instalace - Zpracování: - Inicializuje se... - &Storno - Změnit instalaci - Op&ravit - O&dinstalovat - &Zavřít - Oprava se úspěšně dokončila. - Odinstalace se úspěšně dokončila. - Instalace proběhla úspěšně. - Instalace byla úspěšná. - &Spustit - Před použitím tohoto softwaru musíte restartovat počítač. - &Restartovat - &Zavřít - Instalace se nezdařila. - Instalace se nepovedla. - Odinstalace se nepovedla. - Oprava se nepovedla. - Instalace se nepovedla kvůli jednomu nebo víc problémům. Opravte tyto problémy a zkuste software znovu nainstalovat. Další informace najdete v <a href="#">souboru protokolu</a>. - Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač. - &Restartovat - &Zavřít - [PRODUCT_NAME] se tomto operačním systému nepodporuje. Další informace: [LINK_PREREQ_PAGE] - [PRODUCT_NAME] se v operačních systémech pro platformu x86 nepodporuje. Použijte prosím k instalaci odpovídající instalační program pro platformu x86. - Používané soubory - Následující aplikace používají soubory, které je potřeba aktualizovat: - Zavřete &aplikace a zkuste je restartovat. - A&plikace nezavírejte. Bude potřeba provést restart. - &OK - &Zrušit - Modul runtime .NET - Modul .NET Runtime se používá ke spouštění aplikací .NET na počítači s Windows. .NET je open source, k dispozici pro více platforem a podporovaný Microsoftem. Doufáme, že se vám bude líbit! - Další informace o .NET - Do [DOTNETHOME] se nainstalovaly následující položky. - - [BUNDLEMONIKER] - Prostředky - <A HREF="https://aka.ms/dotnet-docs">Dokumentace</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Zpráva k vydání verze</A> - <A HREF="https://aka.ms/dotnet-tutorials">Kurzy</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetrie pro platformu .NET</A> - <A HREF="https://aka.ms/dev-privacy">Prohlášení o zásadách ochrany osobních údajů</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informace o licencování pro .NET</A> - Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl deleted file mode 100644 index b2798f78a223e5..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName]-Installer - [BUNDLEMONIKER] - Sie benötigen nur eine Shell, einen Text-Editor und 10 Minuten Zeit. - -Bereit? Los geht's! - Möchten Sie den Vorgang wirklich abbrechen? - Vorherige Version - Hilfe zum Setup - /install | /repair | /uninstall | /layout [Verzeichnis]: Installiert, repariert, deinstalliert oder - erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. "Installieren" ist die Standardeinstellung. - -/passive | /quiet: Zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine - Benutzeroberfläche und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt. - -/norestart: Unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf. -/log log.txt: Erstellt das Protokoll in einer bestimmten Datei. Standardmäßig wird die Protokolldatei in %TEMP% erstellt. - S&chließen - Ich &stimme den Lizenzbedingungen zu. - &Optionen - &Installieren - S&chließen - Setupoptionen - Installationsspeicherort: - &Durchsuchen - &OK - &Abbrechen - Setupstatus - Wird verarbeitet: - Initialisierung... - &Abbrechen - Setup ändern - &Reparieren - &Deinstallieren - S&chließen - Die Reparatur wurde erfolgreich abgeschlossen. - Die Deinstallation wurde erfolgreich abgeschlossen. - Die Installation war erfolgreich. - Setup wurde erfolgreich abgeschlossen - &Starten - Sie müssen den Computer neu starten, bevor Sie die Software verwenden können. - &Neu starten - S&chließen - Setupfehler - Setupfehler - Deinstallationsfehler - Reparaturfehler - Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie das Setup erneut aus. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. - Sie müssen Ihren Computer neu starten, um den Rollback der Software abzuschließen. - &Neu starten - &Schließen - [PRODUCT_NAME] wird auf diesem Betriebssystem nicht unterstützt. Weitere Informationen finden Sie unter [LINK_PREREQ_PAGE]. - [PRODUCT_NAME] wird auf x86-Betriebssystemen nicht unterstützt. Installieren Sie das entsprechende x86-Installationsprogramm. - Verwendete Dateien - Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen: - Schließen Sie die &Anwendungen, und versuchen Sie sie erneut zu starten. - &Anwendungen nicht schließen. Ein Neustart ist erforderlich. - &OK - &Abbrechen - .NET-Runtime - Die .NET-Runtime wird zum Ausführen von .NET-Anwendungen auf Ihrem Windows-Computer verwendet. .NET ist ein plattformübergreifendes Open-Source-Framework, das von Microsoft unterstützt wird. Wir wünschen Ihnen viel Spaß damit! - Weitere Informationen zu .NET - Folgendes wurde unter [DOTNETHOME] installiert. - - [BUNDLEMONIKER] - Ressourcen - <A HREF="https://aka.ms/dotnet-docs">Dokumentation</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Versionshinweise</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET-Telemetrie</A> - <A HREF="https://aka.ms/dev-privacy">Datenschutzerklärung</A> - <A HREF="https://aka.ms/dotnet-license-windows">Lizenzierungsinformationen für .NET</A> - Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl deleted file mode 100644 index 5523036197cf03..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] Installer - [BUNDLEMONIKER] - You just need a shell, a text editor and 10 minutes of your time. - -Ready? Set? Let's go! - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - I &agree to the license terms and conditions - &Options - &Install - &Close - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation was successful - Setup Successful - &Launch - You must restart your computer before you can use the software. - &Restart - &Close - Setup Failed - Setup Failed - Uninstall Failed - Repair Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - The [PRODUCT_NAME] is not supported on this operating system. For more information, see [LINK_PREREQ_PAGE]. - The [PRODUCT_NAME] isn't supported on x86 operating systems. Please install using the corresponding x86 installer. - Files In Use - The following applications are using files that need to be updated: - Close the &applications and attempt to restart them. - &Do not close applications. A reboot will be required. - &OK - &Cancel - .NET Runtime - The .NET Runtime is used to run .NET applications, on your Windows computer. .NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! - Learn more about .NET - The following was installed at [DOTNETHOME] - - [BUNDLEMONIKER] - Resources - <A HREF="https://aka.ms/dotnet-docs">Documentation</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Release Notes</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetry</A> - <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> - <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> - By clicking Install, you agree to the following terms. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl deleted file mode 100644 index aad9a6e9196361..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Programme d'installation de [WixBundleName] - [BUNDLEMONIKER] - Vous avez juste besoin d'un interpréteur de commandes, d'un éditeur de texte et de 10 minutes. - -À vos marques ? Prêt ? Partez ! - Voulez-vous vraiment annuler ? - Version précédente - Aide à l'installation - /install | /repair | /uninstall | /layout [répertoire] - installe, répare, désinstalle ou - crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut. - -/passive | /quiet - affiche une interface utilisateur minimale, sans invite, ou n'affiche - ni interface utilisateur, ni invite. Par défaut, l'interface utilisateur et toutes les invites sont affichées. - -/norestart - supprime toutes les tentatives de redémarrage. Par défaut, l'interface utilisateur affiche une invite avant le redémarrage. -/log log.txt - enregistre les informations dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%. - &Fermer - J'&accepte les conditions générales de la licence - &Options - &Installer - &Fermer - Options d'installation - Emplacement d'installation : - &Parcourir - &OK - &Annuler - Progression de l'installation - En cours : - Initialisation... - &Annuler - Modifier l'installation - &Réparer - &Désinstaller - &Fermer - Réparation terminée avec succès - Désinstallation terminée avec succès - Installation réussie - Installation/désinstallation réussie - &Démarrer - Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel. - &Redémarrer - &Fermer - Échec de l'installation - Échec de l'installation - Échec de la désinstallation - Échec de la réparation - Un ou plusieurs problèmes sont à l'origine de l'échec de l'installation. Corrigez ces problèmes, puis recommencez l'installation. Pour plus d'informations, voir le <a href="#">fichier journal</a>. - Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel. - &Redémarrer - &Fermer - [PRODUCT_NAME] n'est pas pris en charge sur ce système d'exploitation. Pour plus d'informations, consultez [LINK_PREREQ_PAGE]. - [PRODUCT_NAME] n'est pas pris en charge sur les systèmes d'exploitation x86. Effectuez l'installation à l'aide du programme d'installation x86 correspondant. - Fichiers en cours d'utilisation - Les applications suivantes utilisent des fichiers nécessitant une mise à jour : - &Fermer les applications essayez de les ouvrir de nouveau. - &Ne pas fermer les applications. Un redémarrage sera nécessaire. - &OK - &Annuler - Runtime .NET - Le runtime .NET vous permet d'exécuter les applications .NET sur votre ordinateur Windows. .NET est open source, multiplateforme et pris en charge par Microsoft. Nous espérons que vous l'apprécierez ! - En savoir plus sur .NET - L'élément suivant a été installé sur [DOTNETHOME] - - [BUNDLEMONIKER] - Ressources - <A HREF="https://aka.ms/dotnet-docs">Documentation</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Notes de publication</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutoriels</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Télémétrie .NET</A> - <A HREF="https://aka.ms/dev-privacy">Déclaration de confidentialité</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informations de licence pour .NET</A> - En cliquant sur Installer, vous acceptez les conditions suivantes. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl deleted file mode 100644 index ff4a8011e3a1b8..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Programma di installazione di [WixBundleName] - [BUNDLEMONIKER] - Bastano solo una shell, un editor di testo e 10 minuti di tempo. - -Pronti per iniziare? - Annullare? - Versione precedente - Guida alla configurazione - /install | /repair | /uninstall | /layout [directory] - installa, ripara, disinstalla o - crea una copia locale completa del bundle nella directory. L'opzione predefinita è install. - -/passive | /quiet - visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente - né prompt. Per impostazione predefinita, viene visualizzata l'intera interfaccia utente e tutti i prompt. - -/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. -/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%. - &Chiudi - &Accetto i termini e le condizioni di licenza - &Opzioni - I&nstalla - &Chiudi - Opzioni di installazione - Percorso di installazione: - &Sfoglia - &OK - &Annulla - Stato installazione - Elaborazione di: - Inizializzazione in corso... - &Annulla - Modifica installazione - &Ripara - &Disinstalla - &Chiudi - La riparazione è stata completata - La disinstallazione è stata completata - L'installazione è riuscita - L'installazione è stata completata - &Avvia - Per poter usare il software, è necessario riavviare il computer. - &Riavvia - &Chiudi - L'installazione non è riuscita - L'installazione non è riuscita - La disinstallazione non è riuscita - La riparazione non è riuscita - L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e ripetere l'installazione. Per altre informazioni, vedere il <a href="#">file di log</a>. - Per completare il rollback del software, è necessario riavviare il computer. - &Riavvia - &Chiudi - [PRODUCT_NAME] non è supportato in questo sistema operativo. Per altre informazioni, vedere [LINK_PREREQ_PAGE]. - [PRODUCT_NAME] non è supportato in sistemi operativi x86. Eseguire l'installazione usando il programma di installazione x86 corrispondente. - File in uso - Le applicazioni seguenti usano file che necessitano di aggiornamento: - Chiudere le &applicazioni e provare a riavviarle. - &Non chiudere le applicazioni; sarà necessario riavviare il sistema - &OK - &Annulla - Runtime di .NET - Runtime di .NET consente di eseguire applicazioni .NET nel computer Windows. .NET è open source, multipiattaforma e supportato da Microsoft. - Altre informazioni su .NET - I componenti seguenti sono stati installati in [DOTNETHOME] - - [BUNDLEMONIKER] - Risorse - <A HREF="https://aka.ms/dotnet-docs">Documentazione</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Note sulla versione</A> - <A HREF="https://aka.ms/dotnet-tutorials">Esercitazioni</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria di .NET</A> - <A HREF="https://aka.ms/dev-privacy">Informativa sulla privacy</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informazioni sulla licenza per .NET</A> - Facendo clic su Installa, si accettano le condizioni seguenti. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl deleted file mode 100644 index 14392af22fcf78..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl +++ /dev/null @@ -1,75 +0,0 @@ - - - [WixBundleName] インストーラー - [BUNDLEMONIKER] - 必要なのは、シェル、テキスト エディター、それに時間が 10 分のみです。 - -では、始めましょう。 - 取り消しますか? - 以前のバージョン - セットアップのヘルプ - /install | /repair | /uninstall | /layout [directory] - バンドルの完全なローカル コピーに対する - ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への - 作成を行います。既定の設定はインストールです。 - -/passive | /quiet - 最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも - 表示しません。既定では UI とすべてのプロンプトが表示されます。 - -/norestart - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。 -/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。 - 閉じる(&C) - ライセンス条項および使用条件に同意する(&A) - オプション(&O) - インストール(&I) - 閉じる(&C) - セットアップ オプション - インストールの場所: - 参照(&B) - OK(&O) - キャンセル(&C) - セットアップの進行状況 - 処理中: - 初期化しています... - キャンセル(&C) - セットアップの変更 - 修復(&R) - アンインストール(&U) - 閉じる(&C) - 修復が正常に完了しました - アンインストールが正常に完了しました - インストールが正常に終了しました - セットアップ完了 - 起動(&L) - ソフトウェアを使用する前にコンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - セットアップ失敗 - セットアップに失敗しました - アンインストールに失敗しました - 修復に失敗しました - 1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 - ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - [PRODUCT_NAME] は、このオペレーティング システムではサポートされていません。詳細については、[LINK_PREREQ_PAGE] を参照してください。 - x86 オペレーティング システムでは、[PRODUCT_NAME] はサポートされていません。対応する x86 インストーラーを使用してインストールしてください。 - ファイルが使用中 - 次のアプリケーションは、更新の必要があるファイルを使用しています: - アプリケーションを閉じて再起動を試みる。(&A) - アプリケーションを終了させない (コンピューターの再起動が必要になります)(&D) - OK(&O) - キャンセル(&C) - .NET Runtime - .NET Runtime は、Windows コンピューターで .NET アプリケーションを実行するために使用されます。.NET はオープン ソースのクロス プラットフォームで、Microsoft によってサポートされています。ぜひご利用ください。 - .Net の詳細情報 - [DOTNETHOME] に以下がインストールされました - - [BUNDLEMONIKER] - リソース - <A HREF="https://aka.ms/dotnet-docs">ドキュメント</A> - <A HREF="https://aka.ms/20-p2-rel-notes">リリース ノート</A> - <A HREF="https://aka.ms/dotnet-tutorials">チュートリアル</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET テレメトリ</A> - <A HREF="https://aka.ms/dev-privacy">プライバシーに関する声明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET のライセンス情報</A> - [インストール] をクリックすると、次の条項に同意したものと見なされます。 - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl deleted file mode 100644 index f07c56b4a5a42c..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] 설치 관리자 - [BUNDLEMONIKER] - 셸, 텍스트 편집기, 10분의 시간만 있으면 됩니다. - -준비되셨나요? 시작합니다! - 취소하시겠습니까? - 이전 버전 - 설치 도움말 - /install | /repair | /uninstall | /layout [directory] - 디렉터리에 번들의 전체 로컬 복사본을 설치, 복구, 제거 또는 - 작성합니다. 설치가 기본값입니다. - -/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 - 프롬프트를 표시하지 않습니다. 기본적으로 UI와 모든 프롬프트가 표시됩니다. - -/norestart - 다시 시작하지 않게 합니다. 기본적으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. -/log log.txt - 특정 파일에 기록합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다. - 닫기(&C) - 동의함(&A) - 옵션(&O) - 설치(&I) - 닫기(&C) - 설치 옵션 - 설치 위치: - 찾아보기(&B) - 확인(&O) - 취소(&C) - 설치 진행률 - 처리 중: - 초기화 중... - 취소(&C) - 설치 수정 - 복구(&R) - 제거(&U) - 닫기(&C) - 복구 완료됨 - 제거 완료됨 - 설치가 완료되었습니다. - 설치 완료 - 시작(&L) - 소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 설치 실패 - 설치 실패 - 제거 실패 - 복구 실패 - 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. - 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 이 운영 체제에서는 [PRODUCT_NAME]이(가) 지원되지 않습니다. 자세한 내용은 [LINK_PREREQ_PAGE]을(를) 참조하세요. - x86 운영 체제에서는 [PRODUCT_NAME]이(가) 지원되지 않습니다. 해당 x86 설치 관리자를 사용하여 설치하세요. - 사용 중인 파일 - 다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다. - 애플리케이션을 닫고 다시 시작합니다(&A). - 애플리케이션을 닫지 않습니다(&D). 다시 부팅해야 합니다. - 확인(&O) - 취소(&C) - .NET 런타임 - .NET 런타임은 Windows 컴퓨터에서 .NET 애플리케이션을 실행하는 데 사용됩니다. .NET은 오픈 소스 및 플랫폼 간이며 Microsoft에서 지원합니다. .NET을 유용하게 사용하시길 바랍니다. - .NET에 대한 자세한 정보 - 다음이 [DOTNETHOME]에 설치되었습니다. - - [BUNDLEMONIKER] - 리소스 - <A HREF="https://aka.ms/dotnet-docs">설명서</A> - <A HREF="https://aka.ms/20-p2-rel-notes">릴리스 정보</A> - <A HREF="https://aka.ms/dotnet-tutorials">자습서</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 원격 분석</A> - <A HREF="https://aka.ms/dev-privacy">개인정보처리방침</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET에 대한 라이선스 정보</A> - [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl deleted file mode 100644 index c7f294d950909e..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Instalator pakietu [WixBundleName] - [BUNDLEMONIKER] - Potrzebujemy tylko powłoki, edytora tekstu i 10 minut czasu. - -Wszystko gotowe? Zaczynamy! - Czy na pewno chcesz anulować? - Poprzednia wersja - Pomoc dotycząca instalacji - /install | /repair | /uninstall | /layout [katalog] - Instaluje, naprawia, odinstalowuje - lub tworzy pełną lokalną kopię pakietu w katalogu. Domyślnie jest używany przełącznik install. - -/passive | /quiet - Wyświetla ograniczony interfejs użytkownika bez monitów albo nie wyświetla ani interfejsu użytkownika, - ani monitów. Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity. - -/norestart - Pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem. -/log log.txt - Tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%. - &Zamknij - &Zgadzam się z postanowieniami licencyjnymi - &Opcje - &Zainstaluj - &Zamknij - Opcje instalacji - Lokalizacja instalacji: - &Przeglądaj - &OK - &Anuluj - Postęp instalacji - Przetwarzanie: - Trwa inicjowanie... - &Anuluj - Modyfikuj instalację - &Napraw - &Odinstaluj - &Zamknij - Pomyślnie ukończono naprawę - Pomyślnie ukończono dezinstalację - Instalacja przebiegła pomyślnie - Pomyślnie ukończono instalację - &Uruchom - Aby móc korzystać z oprogramowania, musisz uruchomić ponownie komputer. - &Uruchom ponownie - &Zamknij - Instalacja nie powiodła się - Instalacja nie powiodła się - Dezinstalacja nie powiodła się - Naprawa nie powiodła się - Co najmniej jeden problem spowodował niepowodzenie instalacji. Rozwiąż problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji, zobacz <a href="#">plik dziennika</a>. - Aby ukończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer. - &Uruchom ponownie - &Zamknij - Produkt [PRODUCT_NAME] nie jest obsługiwany w tym systemie operacyjnym. Aby uzyskać więcej informacji, zobacz [LINK_PREREQ_PAGE]. - Produkt [PRODUCT_NAME] nie jest obsługiwany w systemach operacyjnych x86. Przeprowadź instalację przy użyciu odpowiedniego instalatora x86. - Pliki w użyciu - Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane: - Zamknij &aplikacje i spróbuj je ponownie uruchomić. - &Nie zamykaj aplikacji. Będzie konieczne ponowne uruchomienie. - &OK - &Anuluj - Środowisko uruchomieniowe platformy .NET - Środowisko uruchomieniowe platformy .NET służy do uruchamiania aplikacji platformy .NET na komputerze z systemem Windows. Platforma .NET jest oprogramowaniem typu open source, działa na różnych platformach i jest obsługiwana przez firmę Microsoft. Mamy nadzieję, że Ci się podoba! - Dowiedz się więcej o platformie .NET - Następujące elementy zainstalowano w [DOTNETHOME] - - [BUNDLEMONIKER] - Zasoby - <A HREF="https://aka.ms/dotnet-docs">Dokumentacja</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Informacje o wersji</A> - <A HREF="https://aka.ms/dotnet-tutorials">Samouczki</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria platformy .NET</A> - <A HREF="https://aka.ms/dev-privacy">Zasady zachowania poufności informacji</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informacje o licencjonowaniu dla platformy .NET</A> - Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl deleted file mode 100644 index 2de87f08da3141..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Instalador do [WixBundleName] - [BUNDLEMONIKER] - Você só precisa de um shell, um editor de texto e 10 minutos de seu tempo. - -Tudo pronto? Então, vamos nessa! - Tem certeza de que deseja cancelar? - Versão anterior - Ajuda de Instalação - /install | /repair | /uninstall | /layout [diretório] - instala, repara, desinstala ou - cria uma cópia local completa do pacote no diretório. Install é o padrão - -/passive | /quiet - exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e - nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos. - -/norestart - suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. -/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. - &Fechar - Eu &concordo com os termos e condições da licença - &Opções - &Instalar - &Fechar - Opções de Instalação - Local de instalação: - &Navegar - &OK - &Cancelar - Progresso da Instalação - Processando: - Inicializando... - &Cancelar - Modificar Instalação - &Reparar - &Desinstalar - &Fechar - Reparação Concluída com Êxito - Desinstalação Concluída com Êxito - A instalação foi bem-sucedida - Instalação com Êxito - &Iniciar - Você deve reiniciar seu computador antes de usar o software. - &Reiniciar - &Fechar - Falha na Instalação - Falha na Instalação - Falha na Desinstalação - Falha na Reparação - Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. - Você deve reiniciar seu computador para concluir a reversão do software. - &Reiniciar - &Fechar - Não há suporte para o [PRODUCT_NAME] neste sistema operacional. Para obter mais informações, confira [LINK_PREREQ_PAGE]. - O [PRODUCT_NAME] não tem suporte em sistemas operacionais x86. Instale usando o instalador x86 correspondente. - Arquivos em Uso - Os aplicativos a seguir estão usando arquivos que precisam ser atualizados: - Feche os &aplicativos e tente reiniciá-los. - &Não feche os aplicativos. Será necessária uma reinicialização. - &OK - &Cancelar - Runtime do .NET - O Runtime do .NET é usado para executar aplicativos .NET no seu computador com Windows. O .NET é um software livre, com plataforma cruzada e possui o suporte da Microsoft. Esperamos que você goste! - Saiba mais sobre o .NET - O seguinte foi instalado em [DOTNETHOME] - - [BUNDLEMONIKER] - Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentação</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Notas sobre a Versão</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutoriais</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetria do .NET</A> - <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - < A HREF = "https://aka.ms/dotnet-License-Windows" > Informações de licenciamento para .NET</A> - Ao clicar em instalar, você concorda com os termos a seguir. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl deleted file mode 100644 index fec46b49a5c549..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Установщик [WixBundleName] - [BUNDLEMONIKER] - Вам требуется только оболочка, текстовый редактор и 10 минут времени. - -Готовы? Тогда начинаем! - Вы действительно хотите отменить? - Предыдущая версия - Справка по установке - /install | /repair | /uninstall | /layout [каталог] — установка, восстановление, удаление или - создание полной локальной копии пакета в каталоге. По умолчанию — установка. - -/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и - без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы. - -/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. -/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. - &Закрыть - Я &принимаю условия лицензии - &Параметры - &Установить - &Закрыть - Параметры установки - Расположение установки: - &Обзор - &ОК - Отм&ена - Ход установки - Обработка: - Идет инициализация... - Отм&ена - Изменение установки - &Исправить - &Удалить - &Закрыть - Восстановление успешно завершено - Удаление успешно завершено - Установка успешно завершена - Установка успешно завершена - &Запустить - Перед использованием программного обеспечения необходимо перезапустить компьютер. - &Перезапустить - &Закрыть - Настройка не завершена - Сбой установки - Сбой удаления - Сбой восстановления - Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезапустить - З&акрыть - Продукт [PRODUCT_NAME] не поддерживается в этой операционной системе. Дополнительные сведения: [LINK_PREREQ_PAGE]. - Продукт [PRODUCT_NAME] не поддерживается в операционных системах x86. Установите с помощью соответствующего установщика x86. - Используемые файлы - Следующие приложения используют файлы, которые следует обновить: - Закрыть &приложения и попытаться перезапустить их. - &Не закрывать приложения. Потребуется перезагрузка. - О&К - &Отмена - Среда выполнения .NET - Среда выполнения .NET используется для запуска приложений .NET на компьютерах с Windows. Среда .NET является открытой, кроссплатформенной и поддерживается Майкрософт. Надеемся, вам понравится! - Дополнительные сведения о .NET - Следующее было установлено в [DOTNETHOME] - - [BUNDLEMONIKER] - Ресурсы - <A HREF="https://aka.ms/dotnet-docs">Документация</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Заметки о выпуске</A> - <A HREF="https://aka.ms/dotnet-tutorials">Руководства</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Телеметрия .NET</A> - <A HREF="https://aka.ms/dev-privacy">Заявление о конфиденциальности</A> - <A HREF="https://aka.ms/dotnet-license-windows">Сведения о лицензировании .NET</A> - Нажимая кнопку "Установить", вы принимаете следующие условия. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl deleted file mode 100644 index 8dbcef0001ee81..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] Yükleyicisi - [BUNDLEMONIKER] - Yalnızca bir kabuğa, bir metin düzenleyicisine ve 10 dakikalık bir zamana ihtiyacınız var. - -Hazır mısınız? Haydi başlayalım! - İptal etmek istediğinizden emin misiniz? - Önceki sürüm - Kurulum Yardımı - /install | /repair | /uninstall | /layout [dizin] - yükler, onarır, kaldırır ya da - dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir. - -/passive | /quiet - en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve - istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir. - -/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. -/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur. - &Kapat - Lisans &hüküm ve koşullarını kabul ediyorum - &Seçenekler - &Yükle - &Kapat - Kurulum Seçenekleri - Yükleme konumu: - &Gözat - &Tamam - İ&ptal - Kurulum İlerleme Durumu - İşleniyor: - Başlatılıyor... - İ&ptal - Kurulumu Değiştir - &Onar - &Kaldır - &Kapat - Onarım Başarıyla Tamamlandı - Kaldırma Başarıyla Tamamlandı - Yükleme başarılı oldu - Kurulum Başarılı - &Başlat - Yazılımı kullanabilmek için bilgisayarınızı yeniden başlatmanız gerekiyor. - &Yeniden Başlat - &Kapat - Kurulum Başarısız - Kurulum Başarısız - Yükleme Başarısız - Onarım Başarısız - En az bir sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. - Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor. - &Yeniden Başlat - &Kapat - [PRODUCT_NAME] bu işletim sisteminde desteklenmiyor. Daha fazla bilgi için bkz. [LINK_PREREQ_PAGE]. - [PRODUCT_NAME], x86 işletim sistemlerinde desteklenmiyor. Lütfen karşılık gelen x86 yükleyicisini kullanarak yükleyin. - Kullanımda Olan Dosyalar - Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor: - &Uygulamaları kapatın ve yeniden başlatmayı deneyin. - &Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir. - &Tamam - &İptal - .NET Çalışma Zamanı - .NET Çalışma Zamanı, Windows bilgisayarınızda .NET uygulamalarını çalıştırmak için kullanılır. .NET açık kaynaktır, platformlar arasında kullanılabilir ve Microsoft tarafından desteklenmektedir. Beğeneceğinizi umuyoruz! - .NET hakkında daha fazla bilgi edinin - Aşağıdakiler [DOTNETHOME] konumunda yüklendi - - [BUNDLEMONIKER] - Kaynaklar - <A HREF="https://aka.ms/dotnet-docs">Belgeler</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Sürüm Notları</A> - <A HREF="https://aka.ms/dotnet-tutorials">Öğreticiler</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Telemetrisi</A> - <A HREF="https://aka.ms/dev-privacy">Gizlilik Bildirimi</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET için Lisans Bilgileri</A> - Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl deleted file mode 100644 index 4b3cff08cc0e97..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - [WixBundleName] 安装程序 - [BUNDLEMONIKER] - 你只需要一个 shell、一个文本编辑器，还需花 10 分钟即可。 - -准备好了吗? 要设置? 让我们开始吧! - 是否确实要取消? - 上一版本 - 安装程序帮助 - /install | /repair | /uninstall | /layout [目录] - 安装、修复、卸载 - 目录中的安装包或创建其完整本地副本。Install 为默认选择。 - -/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 - 无提示。默认显示 UI 及全部提示。 - -/norestart - 禁止任何重新启动。默认在重新启动前显示提示 UI。 -/log log.txt - 向特定文件写入日志。默认在 %TEMP% 中创建日志文件。 - 关闭(&C) - 我同意许可条款和条件(&A) - 选项(&O) - 安装(&I) - 关闭(&C) - 安装选项 - 安装位置: - 浏览(&B) - 确定(&O) - 取消(&C) - 安装进度 - 正在处理: - 正在初始化… - 取消(&C) - 修改安装程序 - 修复(&R) - 卸载(&U) - 关闭(&C) - 成功完成了修复 - 成功完成了卸载 - 安装成功 - 设置成功 - 启动(&L) - 在使用此软件之前，您必须重新启动计算机。 - 重新启动(&R) - 关闭(&C) - 设置失败 - 安装失败 - 卸载失败 - 修复失败 - 一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅<a href="#">日志文件</a>。 - 必须重新启动计算机才能完成软件回退。 - 重新启动(&R) - 关闭(&C) - 此操作系统不支持 [PRODUCT_NAME]。有关详细信息，请参阅[LINK_PREREQ_PAGE]。 - x86 操作系统不支持该 [PRODUCT_NAME]。请使用相应的 x86 安装程序进行安装。 - 文件正在使用 - 以下应用程序正在使用的文件需要更新: - 关闭应用程序并尝试重启(&A)。 - 不关闭应用程序(&D)。需要重启。 - 确定(&O) - 取消(&C) - .NET 运行时 - .NET 运行时用于在 Windows 计算机上运行 .NET 应用程序。.NET 是开源、跨平台的，且由 Microsoft 提供支持。希望你喜欢它! - 了解有关 .NET 的详细信息 - 以下项已安装到 [DOTNETHOME] - - [BUNDLEMONIKER] - 资源 - <A HREF="https://aka.ms/dotnet-docs">文档</A> - <A HREF="https://aka.ms/20-p2-rel-notes">发行说明</A> - <A HREF="https://aka.ms/dotnet-tutorials">教程</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET 遥测</A> - <A HREF="https://aka.ms/dev-privacy">隐私声明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET 的许可信息</A> - 单击“安装”即表示你同意以下条款。 - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl b/src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl deleted file mode 100644 index 611eac88f5a633..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl +++ /dev/null @@ -1,74 +0,0 @@ - - - Instalador de [WixBundleName] - [BUNDLEMONIKER] - Solo necesita un shell, un editor de texto y 10 minutos. - -¿Preparados? ¿Listos? ¡Ya! - ¿Está seguro de que desea cancelar? - Versión anterior - Ayuda de configuración - /install | /repair | /uninstall | /layout [directorio]: Instala, repara, desinstala o - crea una copia local completa del lote de aplicaciones del directorio. La opción predeterminada es /install. - -/passive | /quiet: muestra la interfaz de usuario mínima sin mensajes o no muestra ninguna interfaz de usuario - ni mensajes. De forma predeterminada, se muestra la interfaz de usuario y todos los mensajes. - -/norestart: suprime todos los intentos de reinicio. De forma predeterminada, la interfaz de usuario muestra un mensaje antes de reiniciar el equipo. -/log log.txt: crea un registro en un archivo específico. De forma predeterminada, se crea un archivo de registro en %TEMP%. - &Cerrar - &Acepto los términos y condiciones de licencia - &Opciones - &Instalar - &Cerrar - Opciones de instalación - Ubicación de la instalación: - E&xaminar - &Aceptar - &Cancelar - Progreso de la instalación - Procesando: - Inicializando... - &Cancelar - Modificar instalación - &Reparar - &Desinstalar - &Cerrar - La reparación se completó correctamente - La desinstalación se completó correctamente - La instalación se realizó correctamente - La instalación o desinstalación se realizó correctamente - &Iniciar - Debe reiniciar el equipo para poder usar el software. - &Reiniciar - &Cerrar - Error de instalación - No se pudo instalar - No se pudo desinstalar - No se pudo reparar - Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el <a href="#">archivo de registro</a>. - Debe reiniciar el equipo para completar la reversión del software. - &Reiniciar - &Cerrar - [PRODUCT_NAME] no se admite en este sistema operativo. Para obtener más información, consulte [LINK_PREREQ_PAGE]. - [PRODUCT_NAME] no es compatible con los sistemas operativos x86. Instálelo con el instalador x86 correspondiente. - Archivos en uso - Las siguientes aplicaciones usan archivos que se deben actualizar: - Cerrar las &aplicaciones e intentar reiniciarlas. - &No cerrar las aplicaciones. Será necesario un reinicio. - &Aceptar - &Cancelar - Entorno de ejecución .NET - .NET Runtime se usa para ejecutar aplicaciones .NET en un equipo con Windows. Microsoft admite .NET, un código abierto multiplataforma. Esperamos que lo disfrute. - Más información sobre .NET - Lo siguiente se instaló en [DOTNETHOME] - - [BUNDLEMONIKER] - Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentación</A> - <A HREF="https://aka.ms/20-p2-rel-notes">Notas de la versión</A> - <A HREF="https://aka.ms/dotnet-tutorials">Tutoriales</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetría de .NET</A> - <A HREF="https://aka.ms/dev-privacy">Declaración de privacidad</A> - <A HREF="https://aka.ms/dotnet-license-windows">Información de licencias de .NET</A> - Al hacer clic en Instalar, acepta los términos siguientes. - diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets deleted file mode 100644 index 47b1b703c42490..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ /dev/null @@ -1,126 +0,0 @@ - - - - - <_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/ - - - - <_crossHostArch>x86 - - - <_crossHostArch>x64 - - - <_crossHostArch>x64 - - - <_crossHostArch>x64 - - - <_crossDir Condition="'$(_crossHostArch)' != ''">/$(_crossHostArch)_$(TargetArchitecture) - - - - - - - <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" /> - - - - <_runtimeDirectory>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework')) - <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)')) - - - - <_coreLibDirectory>$(CoreCLRArtifactsPath) - <_fxLibDirectory>$(LibrariesSharedFrameworkBinArtifactsPath) - - - - <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)')) - - - - <_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory) - - - - - <_diaSymReaderToolDir>$(IntermediateOutputPath) - - - - - <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" /> - - <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" /> - <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" /> - <_crossgenPlatformDirectories Include="$(_fxLibDirectory)" /> - - - - - <_pathSeparatorEscaped>$([MSBuild]::Escape($([System.IO.Path]::PathSeparator.ToString()))) - <_crossgenPlatformAssemblies>@(_crossgenPlatformDirectories->'%(Identity)', '$(_pathSeparatorEscaped)') - - - - - - - - - true - - - - - runtimes/$(PackageRID)/lib/$(PackageTargetFramework) - runtimes/$(PackageRID)/native - - - - %(RidSpecificFilesToPackage.TargetPath)/%(RidSpecificFilesToPackage.DestinationSubDirectory) - - - - - - - - - - - ref/$(PackageTargetFramework) - - - - <_docFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" /> - - - ref/$(PackageTargetFramework)/%(RecursiveDir) - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj deleted file mode 100644 index a28bc49944189d..00000000000000 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - Microsoft.NETCore.App - false - - - - - - - - - - - - - - - - - - - <_pastShimFiles Include="System.Globalization.Native.dylib" /> - <_pastShimFiles Include="System.Globalization.Native.so" /> - <_pastShimFiles Include="System.IO.Compression.Native.a" /> - <_pastShimFiles Include="System.IO.Compression.Native.dylib" /> - <_pastShimFiles Include="System.IO.Compression.Native.so" /> - <_pastShimFiles Include="System.Native.a" /> - <_pastShimFiles Include="System.Native.dylib" /> - <_pastShimFiles Include="System.Native.so" /> - <_pastShimFiles Include="System.Net.Http.Native.a" /> - <_pastShimFiles Include="System.Net.Http.Native.dylib" /> - <_pastShimFiles Include="System.Net.Http.Native.so" /> - <_pastShimFiles Include="System.Net.Security.Native.a" /> - <_pastShimFiles Include="System.Net.Security.Native.dylib" /> - <_pastShimFiles Include="System.Net.Security.Native.so" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> - - - - - - - - - - - - runtimes/$(PackageRID)/native - - - - tools - - - - runtimes/$(PackageRID)/native/cross - - - runtimes/$(PackageRID)/native/include/%(RecursiveDir) - - - - runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - - - - - - - - - - - - - - - - - <_docFilesToPackage Include="$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/> - - - - - - diff --git a/src/installer/pkg/projects/netstandard/Directory.Build.props b/src/installer/pkg/projects/netstandard/Directory.Build.props deleted file mode 100644 index 1597af77869da2..00000000000000 --- a/src/installer/pkg/projects/netstandard/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - $(MSBuildThisFileDirectory)netstandardRIDs.props - - - - - diff --git a/src/installer/pkg/projects/netstandard/netstandardRIDs.props b/src/installer/pkg/projects/netstandard/netstandardRIDs.props deleted file mode 100644 index 0b0cbcde167d27..00000000000000 --- a/src/installer/pkg/projects/netstandard/netstandardRIDs.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props b/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props deleted file mode 100644 index 2826aeac134c75..00000000000000 --- a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props +++ /dev/null @@ -1,28 +0,0 @@ - - - true - netstandard - Microsoft .NET Standard - - - - - - 2.1 - $(NETStandardPatchVersion) - - .NET Standard 2.1 - .NETStandard - 2.1 - NETStandard.Library - - NetStandard - - - - - - RuntimeIdentifier=$(PackageTargetRuntime) - - - diff --git a/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj b/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj deleted file mode 100644 index b9391580563b03..00000000000000 --- a/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt b/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt deleted file mode 100644 index 8aa32ade39a8c9..00000000000000 --- a/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt +++ /dev/null @@ -1,95 +0,0 @@ -Microsoft.Win32.Primitives|4.3.0 -System.AppContext|4.3.0 -System.Collections|4.3.0 -System.Collections.Concurrent|4.3.0 -System.Collections.Immutable|1.4.0 -System.Collections.NonGeneric|4.3.0 -System.Collections.Specialized|4.3.0 -System.ComponentModel|4.3.0 -System.ComponentModel.EventBasedAsync|4.3.0 -System.ComponentModel.Primitives|4.3.0 -System.ComponentModel.TypeConverter|4.3.0 -System.Console|4.3.0 -System.Data.Common|4.3.0 -System.Diagnostics.Contracts|4.3.0 -System.Diagnostics.Debug|4.3.0 -System.Diagnostics.FileVersionInfo|4.3.0 -System.Diagnostics.Process|4.3.0 -System.Diagnostics.StackTrace|4.3.0 -System.Diagnostics.TextWriterTraceListener|4.3.0 -System.Diagnostics.Tools|4.3.0 -System.Diagnostics.TraceSource|4.3.0 -System.Diagnostics.Tracing|4.3.0 -System.Dynamic.Runtime|4.3.0 -System.Globalization|4.3.0 -System.Globalization.Calendars|4.3.0 -System.Globalization.Extensions|4.3.0 -System.IO|4.3.0 -System.IO.Compression|4.3.0 -System.IO.Compression.ZipFile|4.3.0 -System.IO.FileSystem|4.3.0 -System.IO.FileSystem.DriveInfo|4.3.0 -System.IO.FileSystem.Primitives|4.3.0 -System.IO.FileSystem.Watcher|4.3.0 -System.IO.IsolatedStorage|4.3.0 -System.IO.MemoryMappedFiles|4.3.0 -System.IO.Pipes|4.3.0 -System.IO.UnmanagedMemoryStream|4.3.0 -System.Linq|4.3.0 -System.Linq.Expressions|4.3.0 -System.Linq.Queryable|4.3.0 -System.Net.Http|4.3.0 -System.Net.NameResolution|4.3.0 -System.Net.Primitives|4.3.0 -System.Net.Requests|4.3.0 -System.Net.Security|4.3.0 -System.Net.Sockets|4.3.0 -System.Net.WebHeaderCollection|4.3.0 -System.ObjectModel|4.3.0 -System.Private.DataContractSerialization|4.3.0 -System.Reflection|4.3.0 -System.Reflection.Emit|4.3.0 -System.Reflection.Emit.ILGeneration|4.3.0 -System.Reflection.Emit.Lightweight|4.3.0 -System.Reflection.Extensions|4.3.0 -System.Reflection.Primitives|4.3.0 -System.Reflection.TypeExtensions|4.3.0 -System.Resources.ResourceManager|4.3.0 -System.Runtime|4.3.0 -System.Runtime.Extensions|4.3.0 -System.Runtime.Handles|4.3.0 -System.Runtime.InteropServices|4.3.0 -System.Runtime.InteropServices.RuntimeInformation|4.3.0 -System.Runtime.Loader|4.3.0 -System.Runtime.Numerics|4.3.0 -System.Runtime.Serialization.Formatters|4.3.0 -System.Runtime.Serialization.Json|4.3.0 -System.Runtime.Serialization.Primitives|4.3.0 -System.Security.AccessControl|4.4.0 -System.Security.Claims|4.3.0 -System.Security.Cryptography.Algorithms|4.3.0 -System.Security.Cryptography.Csp|4.3.0 -System.Security.Cryptography.Encoding|4.3.0 -System.Security.Cryptography.Primitives|4.3.0 -System.Security.Cryptography.X509Certificates|4.3.0 -System.Security.Cryptography.Xml|4.4.0 -System.Security.Principal|4.3.0 -System.Security.Principal.Windows|4.4.0 -System.Text.Encoding|4.3.0 -System.Text.Encoding.Extensions|4.3.0 -System.Text.RegularExpressions|4.3.0 -System.Threading|4.3.0 -System.Threading.Overlapped|4.3.0 -System.Threading.Tasks|4.3.0 -System.Threading.Tasks.Extensions|4.3.0 -System.Threading.Tasks.Parallel|4.3.0 -System.Threading.Thread|4.3.0 -System.Threading.ThreadPool|4.3.0 -System.Threading.Timer|4.3.0 -System.ValueTuple|4.3.0 -System.Xml.ReaderWriter|4.3.0 -System.Xml.XDocument|4.3.0 -System.Xml.XmlDocument|4.3.0 -System.Xml.XmlSerializer|4.3.0 -System.Xml.XPath|4.3.0 -System.Xml.XPath.XDocument|4.3.0 diff --git a/src/installer/pkg/projects/netstandard/src/netstandard.depproj b/src/installer/pkg/projects/netstandard/src/netstandard.depproj deleted file mode 100644 index ec841c9a3df97e..00000000000000 --- a/src/installer/pkg/projects/netstandard/src/netstandard.depproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netstandard2.1 - - - - - - - - - - - - - - From 361e75057f574aa978fb95b94ba5ea41bff030cc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 15 Jul 2020 21:35:14 -0700 Subject: [PATCH 023/185] Remove now empty subsets. --- eng/Subsets.props | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index b7967a0a50d47e..726b68b6e32708 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -214,32 +214,11 @@ - - - - - - - - - - - - - - - - - - - - - From 13753c6690a5334c03b1599f83c205bbe924fa50 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 22 Jul 2020 16:15:21 -0700 Subject: [PATCH 024/185] Update installer subsets for testing. --- eng/Subsets.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 726b68b6e32708..c8d9ce50a9c547 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -61,8 +61,8 @@ libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests - installer.pkgprojs + corehost+newsfx+installer.managed+installer.pkgprojs+installer.tests + newsfx+installer.pkgprojs From 31fcde4514e2081c5de5cebce684fcd558f80382 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 22 Jul 2020 16:17:57 -0700 Subject: [PATCH 025/185] Remove non-existent packaging project from subsets. --- eng/Subsets.props | 1 - src/installer/managed/CommonManaged.props | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index c8d9ce50a9c547..0f4fd20a9bf6c0 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -210,7 +210,6 @@ - diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props index c96859a92e4a55..957ee4710e2068 100644 --- a/src/installer/managed/CommonManaged.props +++ b/src/installer/managed/CommonManaged.props @@ -3,6 +3,7 @@ true + true $(MajorVersion).$(MinorVersion).$(PatchVersion) $(VersionPrefix) true From 6683b7ac18c0ea8c6d90f67a7919dee24b2029bc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 22 Jul 2020 16:19:08 -0700 Subject: [PATCH 026/185] Add missing Windows api shim dll to platform manifest. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index f6022ec5f9a424..e966c27f3d6d40 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -150,6 +150,7 @@ + From 7137375fa3227564b6549ef35909f0aaad8d9cdf Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 22 Jul 2020 16:33:52 -0700 Subject: [PATCH 027/185] Update sharedfx sdk. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7e1bffde906940..29d4ec696aca59 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20365.8", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20372.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From f8d1fbef20e3c604656380c1b7c49226661a7ac7 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 09:56:26 -0700 Subject: [PATCH 028/185] Add both versions of the long-name dac to the platform manifest. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets index 58c64221d7fcac..4ef8c7fa24768d 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets @@ -2,6 +2,7 @@ + From 388711d4687dba3fb9f95d8b7458b7a37e373519 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 09:58:59 -0700 Subject: [PATCH 029/185] Skip builds for non-relevant components on Mono. --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 4 ++-- .../pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj | 1 + src/installer/pkg/newsfx/installers/dotnet-host.proj | 1 + src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index c8bcdc052fa2df..20d585a259893b 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -3,6 +3,7 @@ + true RuntimePack Microsoft.NETCore.App.Crossgen2 dotnet-crossgen2 @@ -13,8 +14,7 @@ AddRuntimeFilesToPackage; AddFrameworkFilesToPackage - true - false + true false diff --git a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index 27438a9b7db742..24ccc17ac7aa3c 100644 --- a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -6,6 +6,7 @@ Name, used to generate the bundle upgrade code. Must stay the same to allow bundles in a given product band to upgrade in place. --> + true .NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) ToolPack diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/newsfx/installers/dotnet-host.proj index 354affe2727367..bd76f91d75b091 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-host.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-host.proj @@ -2,6 +2,7 @@ + true true false dotnet-host diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj index 73b6f943eabfc1..07579a125a8948 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj @@ -2,6 +2,7 @@ + true true dotnet-hostfxr-internal dotnet-hostfxr From 006a7614a662615c6ed852ec800382fd5990326d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 10:25:33 -0700 Subject: [PATCH 030/185] Remove installer tests by default temporarily to validate product build. --- eng/Subsets.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 0f4fd20a9bf6c0..da13434a2a5609 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -61,7 +61,7 @@ libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+newsfx+installer.managed+installer.pkgprojs+installer.tests + corehost+newsfx+installer.managed+installer.pkgprojs newsfx+installer.pkgprojs From 0fdcd701ea5940c17cb918ce161c0c595e62f6fc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 10:45:55 -0700 Subject: [PATCH 031/185] Remove pkgprojs subset from mono installer build since it doesn't build the hosts. --- eng/Subsets.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index da13434a2a5609..beb1eb9dad5872 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -62,7 +62,7 @@ libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages corehost+newsfx+installer.managed+installer.pkgprojs - newsfx+installer.pkgprojs + newsfx From a118d3d9d970681114f03c08c5e50e937df5e3ce Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 11:23:42 -0700 Subject: [PATCH 032/185] Skip the apphost pack on mono. --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj index 24948f19fda500..451463a92e1fb2 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -2,6 +2,7 @@ + true AppHostPack true dotnet-apphost-pack From 1d84487c42c1bf13c61f74573fe95a10b320ce92 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 14:44:45 -0700 Subject: [PATCH 033/185] Update host test infra to use the new sfx projects. --- global.json | 2 +- .../Directory.Build.targets | 2 ++ .../TestProjects/Directory.Build.targets | 1 + .../StandaloneApp20/Directory.Build.props | 10 ------- .../StandaloneApp21/Directory.Build.props | 10 ------- .../StandaloneApp3x/Directory.Build.props | 10 ------- .../TestUtils/MNADeprecationWorkaround.props | 26 ------------------- .../tests/Assets/TestUtils/TestProjects.props | 1 - src/installer/tests/Directory.Build.targets | 22 ++++------------ .../PrepareTestAssets/PrepareTestAssets.proj | 20 -------------- 10 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props delete mode 100644 src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props delete mode 100644 src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props delete mode 100644 src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props diff --git a/global.json b/global.json index 29d4ec696aca59..5a9b81467dc5a1 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20372.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets index 4ef8c7fa24768d..e143be6cab8765 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets @@ -6,5 +6,7 @@ + + diff --git a/src/installer/tests/Assets/TestProjects/Directory.Build.targets b/src/installer/tests/Assets/TestProjects/Directory.Build.targets index 099990097e2457..a848b59b8f1994 100644 --- a/src/installer/tests/Assets/TestProjects/Directory.Build.targets +++ b/src/installer/tests/Assets/TestProjects/Directory.Build.targets @@ -9,6 +9,7 @@ BeforeTargets="ProcessFrameworkReferences"> + diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props deleted file mode 100644 index 1162811d9202e2..00000000000000 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - false - - - - - diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props deleted file mode 100644 index 1162811d9202e2..00000000000000 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - false - - - - - diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props deleted file mode 100644 index 1162811d9202e2..00000000000000 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - false - - - - - diff --git a/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props b/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props deleted file mode 100644 index e852ac840f12ef..00000000000000 --- a/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - true - - - - - - - - - - true - true - true - - - diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 46ff7500357656..72150d0f0b5239 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -7,7 +7,6 @@ --> - @@ -102,24 +102,12 @@ --> - - - - - - - $(HostRuntimeIdentifier) diff --git a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj index 56ae5cbefef660..a93ca4447a0c66 100644 --- a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj +++ b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj @@ -4,12 +4,10 @@ - - - - - - - - - - - From 675231842d1edeeea247f4f13abfb2590d6fd30c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 14:45:50 -0700 Subject: [PATCH 034/185] Delete an out of date test (the alternative case this test exercises is now the only case in this repo) --- .../HostActivation.Tests/SharedFxLookup.cs | 43 ------------------- 1 file changed, 43 deletions(-) diff --git a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs index a33195e54174df..fd63e339ec05f8 100644 --- a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs +++ b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs @@ -156,48 +156,5 @@ public void Multiple_SharedFxLookup_Uber_Wins_Over_NetCoreApp_On_PatchRollForwar .And.HaveStdErrContaining(Path.Combine("7777.0.0", "System.Collections.Immutable.dll")) .And.NotHaveStdErrContaining(Path.Combine("9999.1.0", "System.Collections.Immutable.dll")); } - - [Fact] - public void CoreClrLookup_WithNoDirectorySeparatorInDeps() - { - var fixture = SharedFxLookupPortableAppFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SharedFramework.SetRuntimeConfigJson(runtimeConfig, "9999.0.0", null); - - // Add versions in the exe folders - SharedFramework.AddAvailableSharedFxVersions(_builtSharedFxDir, _exeSharedFxBaseDir, "9999.0.0"); - string sharedFxPath = Path.Combine(_exeSharedFxBaseDir, "9999.0.0"); - string sharedFxDepsJsonPath = Path.Combine(sharedFxPath, "Microsoft.NETCore.App.deps.json"); - - // Modify the .deps.json for Microsoft.NETCore.App FX - JObject root = JObject.Parse(File.ReadAllText(sharedFxDepsJsonPath)); - IEnumerable netCoreAppNativeAssets = root["targets"] - .Children().Where(p => p.Name.Contains("/")) - .Children().Children().OfType().Where(p => p.Name.Contains("runtime") && p.Name.Contains("Microsoft.NETCore.App")) - .Values()["native"].Children().OfType(); - - // Change the coreclr.dll asset to specify only "coreclr.dll" as the relative path (no directories). - string coreClrLibraryName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("coreclr"); - JProperty coreClrProperty = netCoreAppNativeAssets.First(p => p.Name.Contains(coreClrLibraryName)); - JProperty newCoreClrProperty = new JProperty(coreClrProperty.Name.Substring(coreClrProperty.Name.LastIndexOf('/') + 1), coreClrProperty.Value); - coreClrProperty.Parent.Add(newCoreClrProperty); - coreClrProperty.Remove(); - - File.WriteAllText(sharedFxDepsJsonPath, root.ToString()); - - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should().Pass() - .And.HaveStdErrContaining($"CoreCLR path = '{Path.Combine(sharedFxPath, coreClrLibraryName)}'"); - } } } From ae145b30596d9693b4eab2f4795209c5a02880bc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 15:06:28 -0700 Subject: [PATCH 035/185] Fix packaging tests and remove NETStandard packaging tests since we aren't producing that ref pack any more. --- global.json | 2 +- .../NETStandardTests.cs | 43 ------------------- .../NuGetArtifactTester.cs | 21 +-------- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs diff --git a/global.json b/global.json index 5a9b81467dc5a1..c98de3800735f5 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs deleted file mode 100644 index 0c5c4a29b97ee8..00000000000000 --- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Microsoft.DotNet.CoreSetup.Test; -using Xunit; - -namespace Microsoft.DotNet.CoreSetup.Packaging.Tests -{ - public class NETStandardTests - { - private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider(); - - [Fact] - public void NETStandardTargetingPackIsValid() - { - using (var tester = NuGetArtifactTester.OpenOrNull( - dirs, - "NETStandard.Library.Ref")) - { - // Allow no targeting pack in case this is a servicing build. - // This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830 - if (tester == null) - { - return; - } - - tester.HasOnlyTheseDataFiles( - "data/FrameworkList.xml", - "data/PackageOverrides.txt"); - - tester.IsTargetingPack(); - - // Most artifacts in the repo use the global Major.Minor, this package doesn't. Test - // this to make sure infra doesn't regress and cause netstandard to lose its special - // 2.1 version. The versioning difference is because netstandard targeting pack - // creation doesn't actually belong in Core-Setup: https://github.com/dotnet/standard/issues/1209 - Assert.Equal( - (2, 1), - (tester.PackageVersion.Major, tester.PackageVersion.Minor)); - } - } - } -} diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs index d5d1aa12a8afce..4af9206f6b3513 100644 --- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs +++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs @@ -34,26 +34,12 @@ public static NuGetArtifactTester OpenOrNull( { id = id ?? project; - string nuspecPath = Path.Combine( - dirs.BaseArtifactsFolder, - "packages", - dirs.Configuration, - "specs", - $"{id}.nuspec"); - - if (!File.Exists(nuspecPath)) - { - return null; - } - - PackageIdentity builtIdentity = new NuspecReader(nuspecPath).GetIdentity(); - string nupkgPath = Path.Combine( dirs.BaseArtifactsFolder, "packages", dirs.Configuration, "Shipping", - $"{builtIdentity}.nupkg"); + $"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg"); // If the nuspec exists, the nupkg should exist. Assert.True(File.Exists(nupkgPath)); @@ -106,10 +92,7 @@ public void IsRuntimePack() IsRuntimeSpecificPack(); HasOnlyTheseDataFiles( - "data/RuntimeList.xml", - "data/PlatformManifest.txt"); - - HasGoodPlatformManifest(); + "data/RuntimeList.xml"); ContainsFrameworkList("RuntimeList.xml"); } From e2e66248828d364ee25fdaa49a6e12e3e71725c2 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 15:13:20 -0700 Subject: [PATCH 036/185] Fixes for test official build failures. Re-eneable installer tests by default. --- eng/Subsets.props | 2 +- eng/pipelines/installer/jobs/base-job.yml | 2 +- .../Microsoft.NETCore.App.Runtime.sfxproj | 3 ++- .../installers/dotnet-runtime-deps/Directory.Build.props | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index beb1eb9dad5872..9926ecbb6c486e 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -61,7 +61,7 @@ libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+newsfx+installer.managed+installer.pkgprojs + corehost+newsfx+installer.managed+installer.pkgprojs+installer.tests newsfx diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index e36339df239000..e810f40f269a39 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -127,7 +127,7 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset corehost+newsfx+installer.pkgprojs -ci + $(Build.SourcesDirectory)/build.sh -subset installer -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 0d61b49c3404ef..bba437a6781cd7 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -40,7 +40,8 @@ - + + diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props index d64ba9a0db61fd..2ffd60dd386422 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props @@ -2,6 +2,7 @@ + ToolPack false dotnet-runtime-deps linux-$(TargetArchitecture) From 54496aba71f21570736596624b7db1f95e451b91 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 16:47:49 -0700 Subject: [PATCH 037/185] Fix condition for building linux installers. --- eng/pipelines/installer/jobs/base-job.yml | 1 - src/installer/pkg/Directory.Build.props | 39 ----------------------- 2 files changed, 40 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index e810f40f269a39..82a4028a7e183d 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -227,7 +227,6 @@ jobs: value: >- /p:PortableBuild=false /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/ - /p:InstallerSourceOSPlatformConfig=linux-x64.$(_BuildConfig) - name: DockerRunMSBuild value: >- diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index 9f4442493b6774..b0b0a8ea74e395 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -28,45 +28,6 @@ true - - $(IntermediateOutputRootPath)packages/ - - $(MSBuildThisFileDirectory)packaging/rpm/templates/ - - - $(ArtifactsBinDir)dotnet-deb-tool\ - $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll - $(RepoRoot)tools-local/dotnet-deb-tool/ - - true - true - true - - true - true - true - - - true - - - $(OSPlatformConfig) - - From 0ce63ef7e807b05f30399022545e84c09a0303be Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 23 Jul 2020 17:00:15 -0700 Subject: [PATCH 038/185] Exclude Mono header files from the deps.json. They don't need to be in it. --- global.json | 2 +- .../Microsoft.NETCore.App.Runtime.sfxproj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index c98de3800735f5..41442221ef660a 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.2", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index bba437a6781cd7..626f0b05c96870 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -61,7 +61,8 @@ runtimes/$(RuntimeIdentifier)/native/cross + Include="@(MonoIncludeFiles)" + ExcludeFromDataFiles="true"> runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir) From 2612fbafe8b54732c61f9c7c39f59817fd09d864 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 09:43:48 -0700 Subject: [PATCH 039/185] Don't include the host files on the sfxproj. --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 626f0b05c96870..e0f629aa5c3fdc 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -41,7 +41,7 @@ - + From d2adc6cd3b4795f18e587ea68cdf1629ac3d8f76 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 11:53:11 -0700 Subject: [PATCH 040/185] Add mono-specific files to the platform manifest. --- .../Microsoft.NETCore.App/Directory.Build.props | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index e966c27f3d6d40..967f2881089fbd 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -329,6 +329,22 @@ + + + + + + + + + + + + + + + + From 3d994ff092d989dc6cbcef4945052fe65038d874 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 11:54:05 -0700 Subject: [PATCH 041/185] Remove extra copy step in installer job. --- eng/pipelines/installer/jobs/base-job.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 82a4028a7e183d..a8e3a4e8b63787 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -429,14 +429,6 @@ jobs: df -h displayName: Disk Usage after Build - # Only in glibc leg, we produce RPMs and Debs - - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'Linux_x64'), eq(parameters.osSubgroup, ''))}}: - - task: CopyFiles@2 - displayName: 'Copy built Portable linux-x64 binaries to staging directory' - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/linux-x64.$(_BuildConfig)/sharedFrameworkPublish' - TargetFolder: '$(Build.StagingDirectory)/sharedFrameworkPublish' - - ${{ each packageBuild in parameters.packageDistroList }}: # This leg's RID matches the build image. Build its distro-dependent packages, as well as # the distro-independent installers. (There's no particular reason to build the distro- From 06d242bded4db112a0fffab0afd89be20d7bba97 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 13:42:25 -0700 Subject: [PATCH 042/185] Include libmonosgen-2.0.a in platform manifest. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index 967f2881089fbd..6575a552054874 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -330,7 +330,7 @@ - + From 90baa80575fb055103500c7003435aa6157286c0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 13:43:47 -0700 Subject: [PATCH 043/185] Fix change in linux-x64 test steps. --- eng/pipelines/installer/jobs/base-job.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index a8e3a4e8b63787..ece4f0e06606e6 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -429,6 +429,8 @@ jobs: df -h displayName: Disk Usage after Build + # Only in glibc leg, we produce RPMs and Debs + - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'Linux_x64'), eq(parameters.osSubgroup, ''))}}: - ${{ each packageBuild in parameters.packageDistroList }}: # This leg's RID matches the build image. Build its distro-dependent packages, as well as # the distro-independent installers. (There's no particular reason to build the distro- From f5434af9d5dd8903e1b1cce361ecff86874e8838 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 15:36:22 -0700 Subject: [PATCH 044/185] Fix display name of linux package steps. --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index ece4f0e06606e6..fad526bf0c265c 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -437,7 +437,7 @@ jobs: # independent installers on this leg, but we need to do it somewhere.) - template: steps/build-linux-package.yml parameters: - distroRid: ${{ packageBuild.imageRid }} + packageType: ${{ packageBuild.packageType }} image: ${{ packageBuild.image }} packageStepDescription: Runtime Deps, Runtime, Framework Packs installers subsetArg: $(installersSubsetArg) From 7b7526d83bf827ac389ee40fb78f8b1ed6f10fe4 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 15:55:29 -0700 Subject: [PATCH 045/185] Build the installers based on the portable build when applicable so they can find their artifacts. --- eng/pipelines/installer/jobs/base-job.yml | 7 ------- eng/pipelines/installer/jobs/steps/build-linux-package.yml | 1 - 2 files changed, 8 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index fad526bf0c265c..17c08658f90136 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -222,17 +222,10 @@ jobs: $(OutputRidArg) /bl:msbuild.publish.binlog - # Tell the build to package up the bits from the portable build. - - name: PackagePortableBitsArgs - value: >- - /p:PortableBuild=false - /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/ - - name: DockerRunMSBuild value: >- docker run -v $(Build.SourcesDirectory):/root/runtime - -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=/root/runtime $(PreserveNuGetAuthDockerArgs) diff --git a/eng/pipelines/installer/jobs/steps/build-linux-package.yml b/eng/pipelines/installer/jobs/steps/build-linux-package.yml index 86f165add3a141..95bae9624037ab 100644 --- a/eng/pipelines/installer/jobs/steps/build-linux-package.yml +++ b/eng/pipelines/installer/jobs/steps/build-linux-package.yml @@ -12,7 +12,6 @@ steps: $(DockerRunMSBuild) ${{ parameters.image }} $(BuildScript) \ --ci \ ${{ parameters.subsetArg }} \ - $(PackagePortableBitsArgs) \ ${{ parameters.packagingArgs }} \ $(CommonMSBuildArgs) \ $(LiveOverridePathArgs) \ From 1840af79117eef7d51f9f527a6d725f1f495ba00 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 16:47:06 -0700 Subject: [PATCH 046/185] The installer build no longer consumes Microsoft.NETCore.Platforms and Microsoft.NETCore.Targets, try removing the dependency on the AllConfigurations leg from the installer build. --- eng/pipelines/installer/jobs/base-job.yml | 23 ----------------------- eng/pipelines/runtime-official.yml | 1 - 2 files changed, 24 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 17c08658f90136..8238e7994864d9 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -25,7 +25,6 @@ parameters: packagingArgs: /p:BuildRpmPackage=true isOfficialBuild: false - useOfficialAllConfigurations: false buildFullPlatformManifest: false liveRuntimeBuildConfig: '' @@ -297,16 +296,6 @@ jobs: - name: LibrariesConfigurationArg value: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}' - # Download allconfigurations bits to a separate location. It overlaps with the live libraries - # download and causes conflict when unzipping to the same location. - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - name: LibrariesDownloadPathAllConfigurations - value: 'artifacts/transport/librariesallconfigurations' - - name: LibrariesAllConfigurationsOverridePathArg - value: /p:LibrariesAllConfigurationsOverridePath=${{ parameters.buildCommandSourcesDirectory }}$(LibrariesDownloadPathAllConfigurations) - - name: LibrariesArtifactNameAllConfigurations - value: libraries_bin_official_allconfigurations - dependsOn: - checkout - ${{ parameters.dependsOn }} @@ -324,8 +313,6 @@ jobs: parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - libraries_build_allconfigurations_Windows_NT_x64_Release steps: @@ -394,16 +381,6 @@ jobs: displayName: 'Libraries artifacts' cleanUnpackFolder: false - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/$(LibrariesDownloadPathAllConfigurations) - # Always use '.zip' because AllConfigurations is built on Windows but used everywhere. - artifactFileName: '$(LibrariesArtifactNameAllConfigurations).zip' - artifactName: '$(LibrariesArtifactNameAllConfigurations)' - displayName: 'Libraries artifacts (AllConfigurations)' - cleanUnpackFolder: false - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} displayName: Install Build Dependencies diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 4defeeef70b8fc..fc6ac2fddb69d4 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -188,7 +188,6 @@ stages: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release isOfficialBuild: ${{ variables.isOfficialBuild }} - useOfficialAllConfigurations: true platforms: - OSX_x64 - Linux_x64 From 15026fbc8ad176257e89c2bf05d37a454b11d3ae Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jul 2020 21:41:06 -0700 Subject: [PATCH 047/185] Set PackageBrandNameSuffix for runtime-deps packages. --- .../newsfx/installers/dotnet-runtime-deps/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props index 2ffd60dd386422..c6eef002699470 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props @@ -3,6 +3,7 @@ ToolPack + Runtime Dependencies false dotnet-runtime-deps linux-$(TargetArchitecture) From 442fed40908186213bd0265907a6d53d61dc2d3c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 27 Jul 2020 16:48:15 +0000 Subject: [PATCH 048/185] Updated sharedfx sdk --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 41442221ef660a..5fe9fd05e701f5 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20373.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20377.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From a2cdf87800527330afbec521cac1dce7994be2f0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 30 Jul 2020 10:33:45 -0700 Subject: [PATCH 049/185] Fix debian runtime-deps dependency elements. --- .../dotnet-runtime-deps/dotnet-runtime-deps-debian.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj index 0b608885b5fd83..7d2d0004ccdf34 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj @@ -19,7 +19,7 @@ - + Include="@(LibIcuPackageDependency->Metadata('Dependencies'))" /> + \ No newline at end of file From 2f6d89252bea154b1f70e7e02659156726dd3e5e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 30 Jul 2020 11:15:44 -0700 Subject: [PATCH 050/185] Add new platform manifest entries. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index 6575a552054874..b2edd365cad373 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -208,6 +208,7 @@ + @@ -217,6 +218,7 @@ + From b97b134c32742b16fcbf7a3d08d36ce365a9fd5b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 30 Jul 2020 11:48:28 -0700 Subject: [PATCH 051/185] Add icudt.dat to the platform manifest. --- .../pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props index b2edd365cad373..4e86733015b030 100644 --- a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props @@ -347,6 +347,7 @@ + From c9597c4e72da1e6a8071930c55783ee6f3c78a74 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 30 Jul 2020 14:16:34 -0700 Subject: [PATCH 052/185] Invert conditions to correctly skip generating installers on non-applicable platforms. --- global.json | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-debian.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj | 2 +- .../dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/global.json b/global.json index 5fe9fd05e701f5..781d9d74366f12 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20377.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20380.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj index 1b1495eaf9c642..9250d0c58f264d 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj @@ -1,7 +1,7 @@ - true + false centos.7 diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj index 7d2d0004ccdf34..9802c22fe4c347 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj @@ -1,7 +1,7 @@ - true + false diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj index 3d3dd247423113..e9202febd879d7 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj @@ -1,7 +1,7 @@ - true + false fedora.27 diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj index 550088d61df03d..bb8bce9641aa1f 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj @@ -1,7 +1,7 @@ - true + false opensuse.42 diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj index c6b902fd178734..0bfc5c41f182d7 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj @@ -1,7 +1,7 @@ - true + false oraclelinux.7 diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj index 0106c2d6a56cfe..081961a3f2b0a3 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj @@ -1,7 +1,7 @@ - true + false rhel.7 diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj index 885715edd246fb..20b96c0e6f848b 100644 --- a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj +++ b/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj @@ -1,7 +1,7 @@ - true + false sles.12 From f521759156389ce215108fc6323d8a4f669ca7e3 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 31 Jul 2020 10:23:53 -0700 Subject: [PATCH 053/185] Create extra installer subset so we can build just the installers (and avoid double-building nuget packages). Rename the newsfx subset and folder to sfx. --- eng/Subsets.props | 18 ++++++++++++------ eng/pipelines/installer/jobs/base-job.yml | 4 ++-- .../pkg/{newsfx => sfx}/Directory.Build.props | 0 .../Directory.Build.props | 0 .../Directory.Build.targets | 0 .../Microsoft.NETCore.App.Crossgen2.sfxproj | 0 .../Microsoft.NETCore.App.Host.sfxproj | 0 .../Microsoft.NETCore.App.Ref.sfxproj | 0 .../Microsoft.NETCore.App.Runtime.sfxproj | 0 .../PackageOverrides.txt | 0 .../Microsoft.NETCore.App.Bundle.bundleproj | 0 .../pkg/{newsfx => sfx}/bundle/bundle.thm | 0 .../pkg/{newsfx => sfx}/bundle/bundle.wxl | 0 .../osx_resources/cs.lproj/conclusion.html | 0 .../bundle/osx_resources/cs.lproj/eula.rtf | Bin .../osx_resources/cs.lproj/welcome.html | 0 .../osx_resources/de.lproj/conclusion.html | 0 .../bundle/osx_resources/de.lproj/eula.rtf | Bin .../osx_resources/de.lproj/welcome.html | 0 .../bundle/osx_resources/dotnetbackground.png | Bin .../osx_resources/en.lproj/conclusion.html | 0 .../bundle/osx_resources/en.lproj/eula.rtf | Bin .../osx_resources/en.lproj/welcome.html | 0 .../osx_resources/es.lproj/conclusion.html | 0 .../bundle/osx_resources/es.lproj/eula.rtf | Bin .../osx_resources/es.lproj/welcome.html | 0 .../osx_resources/fr.lproj/conclusion.html | 0 .../bundle/osx_resources/fr.lproj/eula.rtf | Bin .../osx_resources/fr.lproj/welcome.html | 0 .../osx_resources/it.lproj/conclusion.html | 0 .../bundle/osx_resources/it.lproj/eula.rtf | Bin .../osx_resources/it.lproj/welcome.html | 0 .../osx_resources/ja.lproj/conclusion.html | 0 .../bundle/osx_resources/ja.lproj/eula.rtf | Bin .../osx_resources/ja.lproj/welcome.html | 0 .../osx_resources/ko.lproj/conclusion.html | 0 .../bundle/osx_resources/ko.lproj/eula.rtf | Bin .../osx_resources/ko.lproj/welcome.html | 0 .../osx_resources/pl.lproj/conclusion.html | 0 .../bundle/osx_resources/pl.lproj/eula.rtf | Bin .../osx_resources/pl.lproj/welcome.html | 0 .../osx_resources/pt-br.lproj/conclusion.html | 0 .../bundle/osx_resources/pt-br.lproj/eula.rtf | Bin .../osx_resources/pt-br.lproj/welcome.html | 0 .../bundle/osx_resources/ru.lproj/eula.rtf | Bin .../bundle/osx_resources/tr.lproj/eula.rtf | Bin .../osx_resources/zh-hans.lproj/eula.rtf | Bin .../osx_resources/zh-hant.lproj/eula.rtf | Bin ...shared-framework-distribution-template.xml | 0 .../bundle/theme/1028/bundle.wxl | 0 .../bundle/theme/1029/bundle.wxl | 0 .../bundle/theme/1031/bundle.wxl | 0 .../bundle/theme/1033/bundle.wxl | 0 .../bundle/theme/1036/bundle.wxl | 0 .../bundle/theme/1040/bundle.wxl | 0 .../bundle/theme/1041/bundle.wxl | 0 .../bundle/theme/1042/bundle.wxl | 0 .../bundle/theme/1045/bundle.wxl | 0 .../bundle/theme/1046/bundle.wxl | 0 .../bundle/theme/1049/bundle.wxl | 0 .../bundle/theme/1055/bundle.wxl | 0 .../bundle/theme/2052/bundle.wxl | 0 .../bundle/theme/3082/bundle.wxl | 0 src/installer/pkg/sfx/installers.proj | 13 +++++++++++++ .../installers/dotnet-host.proj | 0 .../installers/dotnet-hostfxr.proj | 0 .../dotnet-runtime-deps/Directory.Build.props | 0 .../Directory.Build.targets | 0 .../dotnet-runtime-deps-centos.7.proj | 0 .../dotnet-runtime-deps-debian.proj | 0 .../dotnet-runtime-deps-fedora.27.proj | 0 .../dotnet-runtime-deps-opensuse.42.proj | 0 .../dotnet-runtime-deps-oraclelinux.7.proj | 0 .../dotnet-runtime-deps-rhel.7.proj | 0 .../dotnet-runtime-deps-sles.12.proj | 0 .../pkg/{newsfx => sfx}/installers/host.wxs | 0 .../installers/osx_scripts/host/postinstall | 0 .../osx_scripts/hostfxr/postinstall | 0 src/installer/tests/Directory.Build.targets | 6 +++--- 79 files changed, 30 insertions(+), 11 deletions(-) rename src/installer/pkg/{newsfx => sfx}/Directory.Build.props (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Directory.Build.props (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Directory.Build.targets (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj (100%) rename src/installer/pkg/{newsfx => sfx}/Microsoft.NETCore.App/PackageOverrides.txt (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/Microsoft.NETCore.App.Bundle.bundleproj (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/bundle.thm (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/cs.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/cs.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/cs.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/de.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/de.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/de.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/dotnetbackground.png (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/en.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/en.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/en.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/es.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/es.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/es.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/fr.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/fr.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/fr.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/it.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/it.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/it.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ja.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ja.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ja.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ko.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ko.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ko.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pl.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pl.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pl.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pt-br.lproj/conclusion.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pt-br.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/pt-br.lproj/welcome.html (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/ru.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/tr.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/zh-hans.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/osx_resources/zh-hant.lproj/eula.rtf (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/shared-framework-distribution-template.xml (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1028/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1029/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1031/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1033/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1036/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1040/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1041/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1042/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1045/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1046/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1049/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/1055/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/2052/bundle.wxl (100%) rename src/installer/pkg/{newsfx => sfx}/bundle/theme/3082/bundle.wxl (100%) create mode 100644 src/installer/pkg/sfx/installers.proj rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-host.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-hostfxr.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/Directory.Build.props (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/Directory.Build.targets (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj (100%) rename src/installer/pkg/{newsfx => sfx}/installers/host.wxs (100%) rename src/installer/pkg/{newsfx => sfx}/installers/osx_scripts/host/postinstall (100%) rename src/installer/pkg/{newsfx => sfx}/installers/osx_scripts/hostfxr/postinstall (100%) diff --git a/eng/Subsets.props b/eng/Subsets.props index 4df09c4bd50127..0c2977302f94f5 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -61,8 +61,8 @@ libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+newsfx+installer.managed+installer.pkgprojs+installer.tests - newsfx + corehost+sfx+installers+installer.managed+installer.pkgprojs+installer.tests + sfx @@ -106,13 +106,12 @@ - - + @@ -217,8 +216,15 @@ - - + + + + + + + + + diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 8238e7994864d9..007ef4bf9a2fe1 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -108,7 +108,7 @@ jobs: - name: BaseJobBuildCommand value: >- - build.cmd -subset corehost+newsfx+installer.pkgprojs -ci + build.cmd -subset corehost+sfx+installer.pkgprojs -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) @@ -229,7 +229,7 @@ jobs: $(PreserveNuGetAuthDockerArgs) - name: installersSubsetArg - value: --subset newsfx + value: --subset installers - name: BaseJobBuildCommand value: | diff --git a/src/installer/pkg/newsfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props similarity index 100% rename from src/installer/pkg/newsfx/Directory.Build.props rename to src/installer/pkg/sfx/Directory.Build.props diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.props rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Directory.Build.targets rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj rename to src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj diff --git a/src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt b/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt similarity index 100% rename from src/installer/pkg/newsfx/Microsoft.NETCore.App/PackageOverrides.txt rename to src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt diff --git a/src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj similarity index 100% rename from src/installer/pkg/newsfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj rename to src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj diff --git a/src/installer/pkg/newsfx/bundle/bundle.thm b/src/installer/pkg/sfx/bundle/bundle.thm similarity index 100% rename from src/installer/pkg/newsfx/bundle/bundle.thm rename to src/installer/pkg/sfx/bundle/bundle.thm diff --git a/src/installer/pkg/newsfx/bundle/bundle.wxl b/src/installer/pkg/sfx/bundle/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/bundle.wxl rename to src/installer/pkg/sfx/bundle/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/cs.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/de.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/dotnetbackground.png b/src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/dotnetbackground.png rename to src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/en.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/es.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/fr.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/it.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ja.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ko.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pl.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/pt-br.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/ru.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/ru.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/tr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/tr.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/zh-hans.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/zh-hans.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/osx_resources/zh-hant.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/newsfx/bundle/osx_resources/zh-hant.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf diff --git a/src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml similarity index 100% rename from src/installer/pkg/newsfx/bundle/shared-framework-distribution-template.xml rename to src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml diff --git a/src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1028/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1029/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1031/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1033/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1036/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1040/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1041/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1042/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1045/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1046/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1049/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/1055/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/2052/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl diff --git a/src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl similarity index 100% rename from src/installer/pkg/newsfx/bundle/theme/3082/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj new file mode 100644 index 00000000000000..c63298e2fc9c57 --- /dev/null +++ b/src/installer/pkg/sfx/installers.proj @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/newsfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-host.proj rename to src/installer/pkg/sfx/installers/dotnet-host.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-hostfxr.proj rename to src/installer/pkg/sfx/installers/dotnet-hostfxr.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.props rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/Directory.Build.targets rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj diff --git a/src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj similarity index 100% rename from src/installer/pkg/newsfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj rename to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj diff --git a/src/installer/pkg/newsfx/installers/host.wxs b/src/installer/pkg/sfx/installers/host.wxs similarity index 100% rename from src/installer/pkg/newsfx/installers/host.wxs rename to src/installer/pkg/sfx/installers/host.wxs diff --git a/src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall similarity index 100% rename from src/installer/pkg/newsfx/installers/osx_scripts/host/postinstall rename to src/installer/pkg/sfx/installers/osx_scripts/host/postinstall diff --git a/src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall similarity index 100% rename from src/installer/pkg/newsfx/installers/osx_scripts/hostfxr/postinstall rename to src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index 05c5f9877f4a89..940a0de7cabad5 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -17,7 +17,7 @@ - @@ -63,7 +63,7 @@ the same as the package's version. Fetch this directly from the project to avoid guesswork. --> @@ -102,7 +102,7 @@ --> From 4c5828d777e948156bb2933f5351aa3eeff07d2b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 31 Jul 2020 10:43:01 -0700 Subject: [PATCH 054/185] Fix Crossgen2 package name. --- global.json | 2 +- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index ce9ea547c97312..9946dfffecb067 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20380.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20381.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index 20d585a259893b..b2ac9ec6d26e58 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -6,6 +6,7 @@ true RuntimePack Microsoft.NETCore.App.Crossgen2 + Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) dotnet-crossgen2 crossgen2 win-x64;linux-x64;linux-musl-x64 From d26bad7f82e572fc0a0be4cb06bc7167b3457ba0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 31 Jul 2020 16:55:21 -0700 Subject: [PATCH 055/185] Clean up some dead MSBuild goo and update the sharedfx package so we can override the crossgen2 package name without breaking the default package id logic. --- global.json | 2 +- src/installer/Directory.Build.props | 4 ---- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 2 +- src/installer/tests/Directory.Build.targets | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/global.json b/global.json index 9946dfffecb067..088d8c16ea04d0 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20381.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20381.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 9c82b3bc21f38d..e785db3c9936fe 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -116,10 +116,6 @@ $(ArtifactsShippingPackagesDir) $(ArtifactsShippingPackagesDir) - - - $(IntermediateOutputRootPath)sharedFrameworkPublish/ - $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index b2ac9ec6d26e58..e3ed43cdfe072c 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -6,7 +6,7 @@ true RuntimePack Microsoft.NETCore.App.Crossgen2 - Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) + Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) dotnet-crossgen2 crossgen2 win-x64;linux-x64;linux-musl-x64 diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index 940a0de7cabad5..018936d85e0445 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -13,10 +13,6 @@ Set up the shared framework copy this set of tests should use. There's no known reason to have one per test project, but RepoDirectoriesProvider may need some tweaking to share. --> - - - - From 494d9bd53aec806e563f3e7a71aacaeb83a0b54c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 3 Aug 2020 10:33:25 -0700 Subject: [PATCH 056/185] Update SharedFX SDK. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 088d8c16ea04d0..d08d65779192ec 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20381.2", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20403.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From d23d093ea9da4d10d49861889f38fd3db915bd5d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 3 Aug 2020 12:27:04 -0700 Subject: [PATCH 057/185] Fix discovery of the built dotnet layout for installer tests. Clean up some MSBuild along this path. --- src/installer/tests/Directory.Build.targets | 4 ++-- src/installer/tests/TestUtils/RepoDirectoriesProvider.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index 018936d85e0445..ede4b161de6716 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -43,8 +43,8 @@ specific path separators or the string compoarison will fail. --> $([System.IO.Path]::DirectorySeparatorChar) - $([System.String]::Copy('$(TestsOutputDir)').Replace('/', '$(DirectorySeparatorChar)')) - $([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)')) + $([System.String]::new('$(TestsOutputDir)').Replace('/', '$(DirectorySeparatorChar)')) + $([System.String]::new('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)')) $(NetCoreRoot) diff --git a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs index 52b10e3e50c8a7..507773773d30ae 100644 --- a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs +++ b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs @@ -78,7 +78,7 @@ public RepoDirectoriesProvider( Path.Combine(RepoRoot, ".packages"); CorehostPackages = corehostPackages ?? Path.Combine(Artifacts, "corehost"); - BuiltDotnet = builtDotnet ?? Path.Combine(BaseObjFolder, osPlatformConfig, "sharedFrameworkPublish"); + BuiltDotnet = builtDotnet ?? Path.Combine(GetTestContextVariable("TEST_ARTIFACTS"), "sharedFrameworkPublish"); } public string GetTestContextVariable(string name) From 9c54206c6f14d898dd8be2d6fa73cbe55a2c1a20 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 4 Aug 2020 22:22:46 -0700 Subject: [PATCH 058/185] Update to use the new refactored packages. --- global.json | 2 +- .../Directory.Build.targets | 5 ++++ .../Microsoft.NETCore.App.Crossgen2.sfxproj | 2 +- .../Microsoft.NETCore.App.Host.sfxproj | 3 ++- .../Microsoft.NETCore.App.Ref.sfxproj | 3 ++- .../Microsoft.NETCore.App.Runtime.sfxproj | 7 +++--- .../Microsoft.NETCore.App.Bundle.bundleproj | 24 ++++++++++--------- .../sfx/installers/Directory.Build.targets | 5 ++++ .../pkg/sfx/installers/dotnet-host.proj | 22 +++++++---------- .../pkg/sfx/installers/dotnet-hostfxr.proj | 20 +++++++++------- .../dotnet-runtime-deps/Directory.Build.props | 4 +--- .../Directory.Build.targets | 6 ++--- .../dotnet-runtime-deps-centos.7.proj | 3 +-- .../dotnet-runtime-deps-debian.proj | 3 +-- .../dotnet-runtime-deps-fedora.27.proj | 3 +-- .../dotnet-runtime-deps-opensuse.42.proj | 3 +-- .../dotnet-runtime-deps-oraclelinux.7.proj | 3 +-- .../dotnet-runtime-deps-rhel.7.proj | 3 +-- .../dotnet-runtime-deps-sles.12.proj | 3 +-- 19 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 src/installer/pkg/sfx/installers/Directory.Build.targets diff --git a/global.json b/global.json index d08d65779192ec..8afa6ec8e12b5e 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20403.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20404.8", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets index e143be6cab8765..6a5c35117c2adc 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets @@ -8,5 +8,10 @@ + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index e3ed43cdfe072c..8b377bb182a247 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -7,7 +7,7 @@ RuntimePack Microsoft.NETCore.App.Crossgen2 Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) - dotnet-crossgen2 + dotnet-crossgen2 crossgen2 win-x64;linux-x64;linux-musl-x64 false diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj index 451463a92e1fb2..20546709aacb88 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -5,7 +5,8 @@ true AppHostPack true - dotnet-apphost-pack + dotnet-apphost-pack + dotnet-apphost-pack NetCore.AppHostPack diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj index 2e13fc1b269bfe..c6e03d0a8fd716 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj @@ -4,7 +4,8 @@ TargetingPack true - dotnet-targeting-pack + dotnet-targeting-pack + dotnet-targeting-pack NetCore.TargetingPack diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index e0f629aa5c3fdc..fbb8787c6295ce 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -4,9 +4,10 @@ RuntimePack - dotnet-runtime-internal - dotnet-runtime - dotnet-runtime-symbols + dotnet-runtime-internal + dotnet-runtime + true + dotnet-runtime-symbols NetCore.SharedFramework true diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index 24ccc17ac7aa3c..ed1910c13783e0 100644 --- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -1,5 +1,4 @@ - - + diff --git a/global.json b/global.json index 69b4b9b5ad9d8c..a98c1145336a35 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20405.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20405.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets index e05f6431769082..be753f2b2723ff 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets @@ -9,8 +9,8 @@ - - + + diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index 63dca973808639..9d3caba9e8aed2 100644 --- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/installer/pkg/sfx/installers/Directory.Build.targets b/src/installer/pkg/sfx/installers/Directory.Build.targets index f399a13aec70f9..d108af94975de8 100644 --- a/src/installer/pkg/sfx/installers/Directory.Build.targets +++ b/src/installer/pkg/sfx/installers/Directory.Build.targets @@ -1,6 +1,6 @@ - + diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj index 663fbb18b759bb..da5edcaa549641 100644 --- a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj @@ -19,7 +19,7 @@ - + From b4804c8edaeebae4da8a11446653c1f3c85adc9c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Aug 2020 10:54:23 -0700 Subject: [PATCH 062/185] Update SDK to fix build skipping for the shared framework sdk. --- eng/Versions.props | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 252e7adeefeea1..a52725016adc6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ 5.0.0-beta.20374.1 5.0.0-beta.20374.1 2.5.1-beta.20374.1 - 5.0.0-dev.20405.3 + 5.0.0-dev.20406.1 5.0.0-beta.20374.1 - 5.0.0-dev.20405.3 + 5.0.0-dev.20406.1 5.0.0-beta.20374.1 5.0.0-beta.20374.1 diff --git a/global.json b/global.json index a98c1145336a35..b94269bc3aafa3 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20405.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From d6be480357bcdb9f21bb5f3b7d8d39f8bc02a36c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Aug 2020 12:34:31 -0700 Subject: [PATCH 063/185] Update SDK with full fix for skipbuild with packaging. --- eng/Versions.props | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a52725016adc6d..a93ddd30e7b3f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ 5.0.0-beta.20374.1 5.0.0-beta.20374.1 2.5.1-beta.20374.1 - 5.0.0-dev.20406.1 + 5.0.0-dev.20406.2 5.0.0-beta.20374.1 - 5.0.0-dev.20406.1 + 5.0.0-dev.20406.2 5.0.0-beta.20374.1 5.0.0-beta.20374.1 diff --git a/global.json b/global.json index b94269bc3aafa3..b26ae5e4eac72c 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From 6f9b6d5086bdf6dab850c684f16b15d013b95ed4 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Aug 2020 14:44:58 -0700 Subject: [PATCH 064/185] Another try for fixing the build-skip infra. --- eng/Versions.props | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a93ddd30e7b3f5..50f7bc997f6c97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ 5.0.0-beta.20374.1 5.0.0-beta.20374.1 2.5.1-beta.20374.1 - 5.0.0-dev.20406.2 + 5.0.0-dev.20406.3 5.0.0-beta.20374.1 - 5.0.0-dev.20406.2 + 5.0.0-dev.20406.3 5.0.0-beta.20374.1 5.0.0-beta.20374.1 diff --git a/global.json b/global.json index b26ae5e4eac72c..0b56a5097f22e7 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.2", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From 78849bf6c96f53e27a59e952c8670078bd23ceb0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Aug 2020 15:20:22 -0700 Subject: [PATCH 065/185] Upgrade SDK. --- eng/Versions.props | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 50f7bc997f6c97..0e57a7785d8680 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ 5.0.0-beta.20374.1 5.0.0-beta.20374.1 2.5.1-beta.20374.1 - 5.0.0-dev.20406.3 + 5.0.0-dev.20406.4 5.0.0-beta.20374.1 - 5.0.0-dev.20406.3 + 5.0.0-dev.20406.4 5.0.0-beta.20374.1 5.0.0-beta.20374.1 diff --git a/global.json b/global.json index 0b56a5097f22e7..ce8f240d80d7ee 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.4", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", From 9b3bb51a8b69ab299e565e4893a3da26430738e6 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 7 Aug 2020 09:56:24 -0700 Subject: [PATCH 066/185] Fix package ids for mono packages. --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 5831bd63835a4b..44534faa975ef9 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -35,7 +35,7 @@ Mono.LLVM.AOT - $(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix) + $(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix).$(RuntimeIdentifier) From d0f53130ec5b40d43487a610678239baefe68bbc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 7 Aug 2020 16:47:19 -0700 Subject: [PATCH 067/185] Fix installer tests after update. --- src/installer/tests/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index ede4b161de6716..d96a1fabfdd650 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -14,8 +14,8 @@ one per test project, but RepoDirectoriesProvider may need some tweaking to share. --> + Targets="PublishToDisk" + Properties="OutputPath=$(TestsOutputDir)sharedFrameworkPublish/" /> Date: Mon, 10 Aug 2020 10:04:50 -0700 Subject: [PATCH 068/185] Add System.Private.Runtime.InteropServices.Javascript.dll to platform manifest --- .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 4e86733015b030..3259b8ba9f3139 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -343,7 +343,7 @@ - + From 1a71e7bf7a4b9ebb7491bda69a766229cbc6931e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 20 Aug 2020 16:33:25 -0700 Subject: [PATCH 069/185] Fix Crossgen2 package to place all files in the tools folder. --- eng/Versions.props | 4 ++-- global.json | 2 +- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 19 +++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fe64acd7339b3b..c3c7cc4dc739d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,9 +58,9 @@ 5.0.0-beta.20417.5 5.0.0-beta.20407.3 2.5.1-beta.20407.3 - 5.0.0-dev.20406.4 + 5.0.0-dev.20420.1 5.0.0-beta.20412.1 - 5.0.0-dev.20406.4 + 5.0.0-dev.20420.1 5.0.0-beta.20407.3 5.0.0-beta.20407.3 diff --git a/global.json b/global.json index 085ddff5777833..20b49b823e791c 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20407.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20407.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20407.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20406.4", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20420.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index 8b377bb182a247..3ec88264f58359 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -18,6 +18,7 @@ true false + tools/ @@ -27,31 +28,29 @@ - + - - + + - - + + - - runtimes/$(RuntimeIdentifier)/native - + - + @@ -62,7 +61,7 @@ - + From 33407b5b164771fa1b4b24fce57a4461ad4db8cd Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 21 Aug 2020 17:21:32 -0700 Subject: [PATCH 070/185] Update to SDK with validation targets. --- eng/Versions.props | 4 ++-- global.json | 2 +- .../Microsoft.NETCore.App/Directory.Build.props | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3c7cc4dc739d1..f487e1cfa24695 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,9 +58,9 @@ 5.0.0-beta.20417.5 5.0.0-beta.20407.3 2.5.1-beta.20407.3 - 5.0.0-dev.20420.1 + 5.0.0-dev.20421.3 5.0.0-beta.20412.1 - 5.0.0-dev.20420.1 + 5.0.0-dev.20421.3 5.0.0-beta.20407.3 5.0.0-beta.20407.3 diff --git a/global.json b/global.json index 20b49b823e791c..cf00e871acea9a 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20407.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20407.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20407.3", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20420.1", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20421.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 3259b8ba9f3139..18c710c9b70a2f 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -350,6 +350,22 @@ + + + + + + + + + + + + + + + + Date: Mon, 24 Aug 2020 13:25:35 -0700 Subject: [PATCH 071/185] Add new ICU files to manifest. --- .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 18c710c9b70a2f..614f6fa432d18a 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -348,6 +348,10 @@ + + + + From 7fe5c8ea7c73736ca7287b384534f1a80e8a1cfe Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 24 Aug 2020 13:26:24 -0700 Subject: [PATCH 072/185] Crossgen2 doesn't need to go through framework resolution so we can permit non-file-versioned dlls. (jitinterface.dll is currently unversioned). Signed-off-by: Jeremy Koritzinsky --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index 3ec88264f58359..d28b36da7e438b 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -38,6 +38,7 @@ + true From a63c9117a4a23c00e30dc998c1529a8d2022bbd5 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 24 Aug 2020 14:26:26 -0700 Subject: [PATCH 073/185] Put the property in a property group. --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index d28b36da7e438b..5b0fe2f263e1fc 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -19,6 +19,7 @@ false tools/ + true @@ -38,7 +39,6 @@ - true From 160bf5d99f3674fed121e0715e9d37c9dea2c1cb Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 26 Aug 2020 11:54:55 -0700 Subject: [PATCH 074/185] Ensure we build corehost before sfx since we no longer directly build the project from the sfx projects. --- eng/Subsets.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index a5476a951d632b..d73555b99fe101 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -210,7 +210,7 @@ - + From ac5ce6c6637d6f6acdfe3126f2a21a08db7289c8 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 26 Aug 2020 15:08:55 -0700 Subject: [PATCH 075/185] Add missing entry for additional ICU data file. --- .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 614f6fa432d18a..cabb5ffacc8d84 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -348,6 +348,7 @@ + From 299745dc2d2a64d6853523b2c28d17deea8c4667 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 26 Aug 2020 15:12:30 -0700 Subject: [PATCH 076/185] Remove step downloading all artifacts and remove MSBuild glue to hook up looking up artifacts in the full download. Signed-off-by: Jeremy Koritzinsky --- eng/liveBuilds.targets | 35 ----------------------- eng/pipelines/installer/jobs/base-job.yml | 23 --------------- 2 files changed, 58 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 507a2e34abb0c4..b712b9c80ceab0 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -12,41 +12,6 @@ $(LibrariesTargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture) - - - - $(RuntimeIdentifier) - $(ArtifactPlatform.Replace('win-', 'Windows_NT-')) - $(ArtifactPlatform.Replace('unix-', 'Unix-')) - $(ArtifactPlatform.Replace('linux-', 'Linux-')) - $(ArtifactPlatform.Replace('osx-', 'OSX-')) - $(ArtifactPlatform.Replace('freebsd-', 'FreeBSD-')) - $(ArtifactPlatform.Replace('netbsd-', 'NetBSD-')) - - $(ArtifactPlatform.Replace('-', '_')) - - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'CoreCLRProduct_$(ArtifactPlatform)_$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'MonoProduct_$(ArtifactPlatform)_$(MonoConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'libraries_bin_$(ArtifactPlatform)_$(LibrariesConfiguration)')) - - - * - - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLRTargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)')) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 708941916e7b44..a8175a4d66410b 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -245,26 +245,16 @@ jobs: value: >- $(RuntimeArtifactsArgs) $(LibrariesConfigurationArg) - $(LibrariesAllConfigurationsOverridePathArg) - $(AllArtifactsArgs) - name: RuntimeArtifactsArgs value: '' - name: LibrariesConfigurationArg value: '' - - name: LibrariesAllConfigurationsOverridePathArg - value: '' - - name: AllArtifactsArgs - value: '' - name: RuntimeDownloadPath value: '' - name: LibrariesDownloadPath value: '' - - name: LibrariesDownloadPathAllConfigurations - value: '' - - name: AllArtifactsDownloadPath - value: '' - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - name: liveRuntimeLegName @@ -351,19 +341,6 @@ jobs: - template: /eng/pipelines/common/clone-checkout-bundle-step.yml - # Download and extract artifacts for earlier subsets. - - task: DownloadBuildArtifacts@0 - displayName: 'Download artifacts for all platforms' - inputs: - buildType: current - downloadType: specific - downloadPath: '$(Build.SourcesDirectory)/__download__/AllPlatforms/' - allowPartiallySucceededBuilds: true - itemPattern: | - $(runtimeFlavorName)Product_*/** - libraries_bin_*/** - !*Logs* - - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: From faf52ecb6436bc328de0147a948fad9de735093a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 15 Sep 2020 15:58:35 -0700 Subject: [PATCH 077/185] Update SDK Signed-off-by: Jeremy Koritzinsky --- eng/Versions.props | 4 ++-- global.json | 2 +- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2e791df200b4e6..0882abc2239fa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,9 +60,9 @@ 5.0.0-beta.20431.4 5.0.0-beta.20431.4 2.5.1-beta.20431.4 - 5.0.0-dev.20421.3 + 5.0.0-dev.20465.2 5.0.0-beta.20431.4 - 5.0.0-dev.20421.3 + 5.0.0-dev.20465.2 5.0.0-beta.20431.4 5.0.0-beta.20431.4 diff --git a/global.json b/global.json index 217fee57621778..d1f02e7944dc4e 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20421.3", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20465.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1", diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index 2a6a257377ffea..4223dcc8aadd8d 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -92,4 +92,20 @@ DiaSymReader="$(_diaSymReaderPathIfExists)" /> + + + + + + + + <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" /> + + + + + From a58918253581d0cae5ae5d040516f59767afd8ce Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 15 Sep 2020 16:49:29 -0700 Subject: [PATCH 078/185] Update SDK to get MSI fix. Signed-off-by: Jeremy Koritzinsky --- eng/Versions.props | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0882abc2239fa7..beb4b23a34d73c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,9 +60,9 @@ 5.0.0-beta.20431.4 5.0.0-beta.20431.4 2.5.1-beta.20431.4 - 5.0.0-dev.20465.2 + 5.0.0-dev.20465.3 5.0.0-beta.20431.4 - 5.0.0-dev.20465.2 + 5.0.0-dev.20465.3 5.0.0-beta.20431.4 5.0.0-beta.20431.4 diff --git a/global.json b/global.json index d1f02e7944dc4e..1597821fe5e9ab 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", - "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20465.2", + "Microsoft.DotNet.SharedFramework.Sdk": "5.0.0-dev.20465.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1", From 9e4ce3ca216bbd8710afd7299b201a4f1ba9e2ee Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 16 Sep 2020 10:27:04 -0700 Subject: [PATCH 079/185] Don't even try building the hosting, crossgen2, or bundle installers when RuntimeFlavor is Mono. --- eng/Subsets.props | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 4f4bee17d4b4a4..14a35db83c3e14 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -247,9 +247,13 @@ - - - + + + + + + + From 1f34d318fe9d58c58e55eb9757f7a9ed577471d7 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 16 Sep 2020 10:29:29 -0700 Subject: [PATCH 080/185] Remove out of date comment. Signed-off-by: Jeremy Koritzinsky --- eng/Subsets.props | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 14a35db83c3e14..02852f067af0af 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -20,20 +20,6 @@ This builds and executes the installer test projects. (The '-test' argument is an Arcade SDK argument that indicates tests should be run. Otherwise, they'll only be built.) - - Quirks: - - This command looks useful, but doesn't work as expected: - - ./build.sh -test /p:Subset=CoreHost-Test # (Doesn't work!) - - Intuitively, this should build the host, build the tests, then run the tests on the freshly - built host. What actually happens is the tests run on a previously built host. This is because - the depproj, pkgproj, and installer subsets process the host artifacts, and those didn't - rebuild because those subsets were disabled. - - You can get around this limitation by running the corehost subset, manually copying host - artifacts to the test layout, then running the test subset. --> From 829d01aa780fbb02407f6c9007f92181444a2442 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 29 Oct 2020 16:19:13 -0700 Subject: [PATCH 081/185] Rename subsets based on PR discussion. --- eng/Subsets.props | 102 ++++++++++-------- eng/pipelines/installer/jobs/base-job.yml | 10 +- .../jobs/prepare-signed-artifacts.yml | 2 +- 3 files changed, 62 insertions(+), 52 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index fe7af6056e63cc..23e58a3f5794b3 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -7,24 +7,24 @@ Examples: - ./build.sh CoreHost + ./build.sh host.native - This builds only the .NET Core Host. + This builds only the .NET host. - ./build.sh corehost installer.managed + ./build.sh libs+host.native - This builds the CoreHost and also the Managed installer portion (e.g. Microsoft.NET.HostModel) - projects. A space ' ' or '+' are the delimiters between multiple subsets to build. + This builds the .NET host and also the manged libraries portion. + A space ' ' or '+' are the delimiters between multiple subsets to build. - ./build.sh -test installer.tests + ./build.sh -test host.tests This builds and executes the installer test projects. (The '-test' argument is an Arcade SDK argument that indicates tests should be run. Otherwise, they'll only be built.) --> - clr+mono+libs+installer - mono+libs+installer + clr+mono+libs+host+packs + mono+libs+packs @@ -49,9 +49,11 @@ libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+sfx+installers+installer.managed+installer.pkgprojs+installer.tests - sfx - corehost+$(DefaultInstallerSubsets) + host.native+host.pkg+host.tools+host.tests + + host.native + + packs.product+packs.tests @@ -59,8 +61,8 @@ <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) <_subset>$(_subset.Replace('+mono+', '+$(DefaultMonoSubsets)+')) <_subset>$(_subset.Replace('+libs+', '+$(DefaultLibrariesSubsets)+')) - <_subset>$(_subset.Replace('+installer+', '+$(DefaultInstallerSubsets)+')) - <_subset>$(_subset.Replace('+installer.nocorehost+', '+$(DefaultInstallerSubsets.Replace('corehost+', ''))+')) + <_subset>$(_subset.Replace('+host+', '+$(DefaultHostSubsets)+')) + <_subset>$(_subset.Replace('+packs+', '+$(DefaultPacksSubsets)+')) <_subset>+$(_subset.Trim('+'))+ @@ -102,19 +104,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + @@ -233,23 +237,34 @@ - - - - + + + + - + - + - + - + + + + + + + + + + - + + + @@ -257,31 +272,26 @@ - + - + - + - - - - - - + - + - - + + - + diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index d776749f948d37..105ba5ac0ee33d 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -111,7 +111,7 @@ jobs: - name: BaseJobBuildCommand value: >- - build.cmd -subset installer -ci + build.cmd -subset host+packs -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) @@ -149,7 +149,7 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset installer -ci + $(Build.SourcesDirectory)/build.sh -subset packs -ci $(BuildAction) -configuration $(_BuildConfig) -os ${{ parameters.osGroup }} @@ -235,7 +235,7 @@ jobs: $(PreserveNuGetAuthDockerArgs) - name: installersSubsetArg - value: --subset installers + value: --subset packs.installers - name: BaseJobBuildCommand value: | @@ -380,7 +380,7 @@ jobs: # Build corehost, sign and add entitlements to MacOS binaries - ${{ if eq(parameters.osGroup, 'OSX') }}: - - script: $(BaseJobBuildCommand) -subset corehost + - script: $(BaseJobBuildCommand) -subset host.native displayName: Build CoreHost - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -394,7 +394,7 @@ jobs: path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist - - script: $(BaseJobBuildCommand) -subset installer.nocorehost + - script: $(BaseJobBuildCommand) -subset host.pkg+host.tools+packs displayName: Build and Package - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 42c8bb69b73f61..aed63d92306ce9 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -43,7 +43,7 @@ jobs: - script: >- build.cmd -ci - -subset installer.publish + -subset publish -configuration Release /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }} /p:OfficialBuildId=$(Build.BuildNumber) From a72bc609d44ba75e24feaac7058884f70975e733 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 29 Oct 2020 16:40:50 -0700 Subject: [PATCH 082/185] Update platform manifest and fix path to 3rd party notices for installer. --- .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 1 + src/installer/pkg/sfx/installers/dotnet-host.proj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 3a39022dbb29dc..2b73ecc946e8ba 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -216,6 +216,7 @@ + diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj index c103a4382886dd..aa2563c72c922c 100644 --- a/src/installer/pkg/sfx/installers/dotnet-host.proj +++ b/src/installer/pkg/sfx/installers/dotnet-host.proj @@ -35,7 +35,7 @@ - Date: Thu, 29 Oct 2020 17:06:39 -0700 Subject: [PATCH 083/185] Remove test feed. --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 9560378dfb030c..5f2930685412f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,6 @@ - From dbf59d749dcd2ad31f036a94798cce8fbc51f098 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 30 Oct 2020 11:29:34 -0700 Subject: [PATCH 084/185] Update subset references I missed. --- eng/pipelines/installer/jobs/base-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 105ba5ac0ee33d..0c388abf274fa3 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -185,7 +185,7 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - name: BuildScript - value: ./eng/install-nuget-credprovider-then-build.sh --subset installer + value: ./eng/install-nuget-credprovider-then-build.sh --subset host+packs - name: MSBuildScript value: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh @@ -211,7 +211,7 @@ jobs: - name: BuildArguments value: >- - -subset installer -ci + -subset host+packs -ci $(BuildAction) /p:CrossBuild=${{ parameters.crossBuild }} /p:PortableBuild=$(_PortableBuild) From 3027275ad5c6ac9b89991d53a2df60821d9371d5 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 30 Oct 2020 13:59:42 -0700 Subject: [PATCH 085/185] Fixed the subset arguments in other yaml files. --- eng/pipelines/coreclr/perf.yml | 2 +- eng/pipelines/runtime-official.yml | 6 +++--- eng/pipelines/runtime.yml | 16 ++++++++-------- eng/pipelines/runtimelab.yml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 8b12dae2dd1dcb..a323d03c9e8e5e 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -48,7 +48,7 @@ jobs: platforms: - Browser_wasm jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index ac6ec81daee4af..62959b7ce95f49 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -114,7 +114,7 @@ stages: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: AllSubsets_Mono isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-unsigned-artifacts-step.yml @@ -143,7 +143,7 @@ stages: buildConfig: release runtimeFlavor: mono jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false nameSuffix: AllSubsets_Mono_LLVMJIT runtimeVariant: LLVMJIT @@ -156,7 +156,7 @@ stages: buildConfig: release runtimeFlavor: mono jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true nameSuffix: AllSubsets_Mono_LLVMAOT runtimeVariant: LLVMAOT diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e28c814872ba0f..bc5576de6658e6 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -271,7 +271,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -292,7 +292,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -320,7 +320,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( @@ -473,7 +473,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( @@ -493,7 +493,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( @@ -516,7 +516,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( @@ -535,7 +535,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index 9609db224c2c03..0559bd8722c4bd 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -71,7 +71,7 @@ stages: jobParameters: timeoutInMinutes: 100 testGroup: innerloop - buildArgs: -s clr+libs+installer -c debug -runtimeConfiguration Checked + buildArgs: -s clr+libs+host+packs -c debug -runtimeConfiguration Checked extraStepsTemplate: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml extraStepsParameters: uploadRuntimeTests: true @@ -94,7 +94,7 @@ stages: uploadLibrariesTests: ${{ eq(variables.isOfficialBuild, false) }} uploadUnsignedArtifacts: false ${{ if eq(variables.isOfficialBuild, false) }}: - buildArgs: -s clr+libs+libs.tests+installer -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true ${{ if eq(variables.isOfficialBuild, true) }}: buildArgs: -s clr+libs -c $(_BuildConfig) From d52caae008cdad1088b9bd51bb926eb681e93947 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 6 Nov 2020 08:30:22 -0500 Subject: [PATCH 086/185] Redesign mono.aotcross building --- eng/Subsets.props | 7 ++++++- src/mono/CMakeLists.txt | 12 ++++++++++++ src/mono/mono.proj | 27 +++++++++++++++++++++++++-- src/mono/monoaotcross.proj | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 src/mono/monoaotcross.proj diff --git a/eng/Subsets.props b/eng/Subsets.props index 4cb1643829dcd8..484f8608598c69 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -92,6 +92,7 @@ + @@ -199,7 +200,7 @@ - + @@ -211,6 +212,10 @@ + + + + diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index bbc2963fc7e18d..c4233d45eb9399 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -147,6 +147,18 @@ if(NOT AOT_TARGET_TRIPLE STREQUAL "") elseif(AOT_TARGET_TRIPLE STREQUAL "wasm32-unknown-none") set(TARGET_SYSTEM_NAME "Emscripten") set(TARGET_ARCH "wasm") + elseif(AOT_TARGET_TRIPLE STREQUAL "x86_64-none-linux-android") + set(TARGET_SYSTEM_NAME "Android") + set(TARGET_ARCH "x86_64") + elseif(AOT_TARGET_TRIPLE STREQUAL "i686-none-linux-android") + set(TARGET_SYSTEM_NAME "Android") + set(TARGET_ARCH "x86") + elseif(AOT_TARGET_TRIPLE STREQUAL "aarch64-v8a-linux-android") + set(TARGET_SYSTEM_NAME "Android") + set(TARGET_ARCH "arm64") + elseif(AOT_TARGET_TRIPLE STREQUAL "armv7-none-linux-androideabi") + set(TARGET_SYSTEM_NAME "Android") + set(TARGET_ARCH "arm") elseif(AOT_TARGET_TRIPLE STREQUAL "aarch64-linux-gnu") set(TARGET_SYSTEM_NAME "Linux") set(TARGET_ARCH "arm64") diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 90385f06c80533..3b841a95a52cfe 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -32,9 +32,11 @@ true true true + true true true true + true $(MonoObjDir)cross\config.h true true @@ -357,8 +359,20 @@ $(EMSDK_PATH)/upstream/lib/libclang.so + + + true + $(ANDROID_NDK_ROOT)/sysroot + aarch64-v8a-linux-android + armv7-none-linux-androideabi + i686-none-linux-android + x86_64-none-linux-android + $(MonoObjDir)cross/offsets-$(Platform).h + + - $(XcodeDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib + $(XcodeDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib + $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.9svn $(MonoCrossDir) @@ -407,6 +421,15 @@ + + + + + + + @@ -472,7 +495,7 @@ SkipUnchangedFiles="true" Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsBrowser)' == 'true'"/> - + diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj new file mode 100644 index 00000000000000..8207642ce947ea --- /dev/null +++ b/src/mono/monoaotcross.proj @@ -0,0 +1,32 @@ + + + android-x64;android-arm64 + $(MonoAotDefaultTargets) + + + + + + + + + + + + + $(MonoAotTargetRid.Split('-')[0]) + $(MonoAotTargetRid.Split('-')[1]) + + + + + + + From 940b262b21e96874b4b5b8acecb4e5632f65903c Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 9 Nov 2020 15:34:20 -0500 Subject: [PATCH 087/185] Rejiggle so AOT compiler gets copied to HOST/cross/TARGET dir --- src/mono/mono.proj | 15 +++------------ src/mono/monoaotcross.proj | 12 ++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 3b841a95a52cfe..9a0969cb39855e 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -421,15 +421,6 @@ - - - - - - - @@ -457,7 +448,7 @@ $(RuntimeBinDir)$(MonoStaticFileName) <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)"> - $(RuntimeBinDir)cross\mono-aot-cross + $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\mono-aot-cross <_MonoRuntimeArtifacts Condition="'$(MonoBundleLLVMOptimizer)' == 'true'" Include="$(MonoLLVMDir)\bin\llc"> $(RuntimeBinDir)\llc @@ -466,10 +457,10 @@ $(RuntimeBinDir)\opt <_MonoRuntimeArtifacts Condition="'$(MonoAOTBundleLLVMOptimizer)' == 'true'" Include="$(MonoAOTLLVMDir)\bin\llc"> - $(RuntimeBinDir)cross\llc + $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\llc <_MonoRuntimeArtifacts Condition="'$(MonoAOTBundleLLVMOptimizer)' == 'true'" Include="$(MonoAOTLLVMDir)\bin\opt"> - $(RuntimeBinDir)cross\opt + $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\opt <_MonoIncludeArtifacts Include="$(MonoObjDir)out\include\**" /> <_MonoRuntimeArtifacts Condition="'$(_MonoIncludeInterpStaticFiles)' == 'true'" Include="$(MonoObjDir)out\lib\libmono-ee-interp.a"> diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 8207642ce947ea..5bf00140f29c62 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -12,7 +12,7 @@ + Properties="MonoAotTargetRid=%(MonoAotTargetRids.Identity);RealRuntimeBinDir=$(RuntimeBinDir)" /> @@ -25,8 +25,16 @@ Projects="$(MSBuildThisFileDirectory)llvm\llvm-init.proj" Properties="TargetArchitecture=$(MonoAotTargetArchitecture);TargetOS=$(MonoAotTargetOS)" /> - + + + <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid)\**" /> + + + + + From ed414dca4963eae13cc103396e1a91b619b87fc6 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 18 Nov 2020 16:56:36 -0500 Subject: [PATCH 088/185] Build a package with the cross compiler inside (hardcoded to android-x64 thus far) --- eng/Subsets.props | 1 + eng/liveBuilds.targets | 2 + ...Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 57 +++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj diff --git a/eng/Subsets.props b/eng/Subsets.props index 8b45993f540469..37fb8a74cbdd63 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -287,6 +287,7 @@ + diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index aeee8b277f1956..bd0f901c75a958 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -25,6 +25,8 @@ $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework')) $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'crossgen2')) + $([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)', 'cross')) + $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'packages', '$(LibrariesConfiguration)')) $([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'Shipping')) $([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'NonShipping')) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj new file mode 100644 index 00000000000000..bbba68aca3ff0b --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -0,0 +1,57 @@ + + + + + + android-x64 + true + RuntimePack + Microsoft.NETCore.App.MonoCrossAOT + Microsoft.NETCore.App.MonoCrossAOT.$(RuntimeIdentifier).targeting.$(TargetCrossRid) + dotnet-monocrossaot + monocrossaot + win-x64;linux-x64;osx-x64 + false + + AddRuntimeFilesToPackage; + AddFrameworkFilesToPackage + + false + tools/ + true + + + + unix + win + $(TargetOSComponent)-$(TargetArchitecture) + + + + + + + + + + + + + + + + + + + + + <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" /> + + + + + + From a7f983dc7b0b1effc648211ace4ffc70f52bc480 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 19 Nov 2020 12:45:03 -0500 Subject: [PATCH 089/185] Parallelize, apparently successfully --- eng/Subsets.props | 2 +- ...Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 11 ++++----- .../monocrossaot.sfxproj | 23 +++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj diff --git a/eng/Subsets.props b/eng/Subsets.props index 37fb8a74cbdd63..da3e95d5cbaf3f 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -287,7 +287,7 @@ - + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index bbba68aca3ff0b..7d1b22d280c993 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -3,7 +3,6 @@ - android-x64 true RuntimePack Microsoft.NETCore.App.MonoCrossAOT @@ -20,12 +19,6 @@ tools/ true - - - unix - win - $(TargetOSComponent)-$(TargetArchitecture) - @@ -40,6 +33,10 @@ + + + + + + android-x64;android-arm64 + $(MonoAotDefaultTargets) + + + + + + + + + + + + + + From 6cdebd8298c6d8be901bc711ea8763f37f7ac209 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 19 Nov 2020 15:53:56 -0500 Subject: [PATCH 090/185] Pull in changes from the other PR --- .../sample/Android/AndroidSampleApp.csproj | 26 +++++++++++++++++++ src/mono/netcore/sample/Android/Makefile | 2 ++ .../AotCompilerTask/MonoAOTCompiler.props | 4 ++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj index 48e85f87cecfda..b5c30187c62dc2 100644 --- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj @@ -20,7 +20,10 @@ + + @@ -30,8 +33,30 @@ $(OutputPath)apk\ + + + @(MonoAOTCompilerDefaultAotArguments, ';') + @(MonoAOTCompilerDefaultProcessArguments, ';') + + + + + + + + + + + diff --git a/src/mono/netcore/sample/Android/Makefile b/src/mono/netcore/sample/Android/Makefile index 02aab8fb8ac0a7..2c22d9f1e5d6d1 100644 --- a/src/mono/netcore/sample/Android/Makefile +++ b/src/mono/netcore/sample/Android/Makefile @@ -13,6 +13,8 @@ run: /p:TargetOS=Android \ /p:Configuration=$(MONO_CONFIG) \ /p:DeployAndRun=true \ + /p:UseAotForSimulator=true \ + /p:UseLLVM=true \ /p:RunActivity=false clean: diff --git a/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props index db518b2e8455da..ee37597effd933 100644 --- a/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props @@ -10,8 +10,10 @@ + + + - From 9fe782739648099b1d0de0560d69e2871b85801f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 19 Nov 2020 15:58:50 -0500 Subject: [PATCH 091/185] Only build cross-compiler packs on Linux FOR NOW, until we have NDK on Win/Mac --- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index 7d1b22d280c993..2b37161c494e3a 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -9,7 +9,7 @@ Microsoft.NETCore.App.MonoCrossAOT.$(RuntimeIdentifier).targeting.$(TargetCrossRid) dotnet-monocrossaot monocrossaot - win-x64;linux-x64;osx-x64 + linux-x64 false AddRuntimeFilesToPackage; From 1fa227444e7a9d3e8b0f33cf53beb85fa287e79a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 20 Nov 2020 08:59:52 -0500 Subject: [PATCH 092/185] Fix building locally --- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index fb94084bf329cd..aacc5309de4850 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -8,7 +8,12 @@ - + + + + + Date: Fri, 20 Nov 2020 10:52:07 -0500 Subject: [PATCH 093/185] Fix up subset behaviour --- eng/Subsets.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index da3e95d5cbaf3f..b28fffc4cf2813 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -45,6 +45,7 @@ mono.llvm+ mono.llvm+ $(DefaultMonoSubsets)mono.wasmruntime+ + $(DefaultMonoSubsets)mono.aotcross+ $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages libs.native+libs.ref+libs.src+libs.pretest+libs.packages @@ -287,7 +288,7 @@ - + From a666da5321b2aa8611044288ce7e43c0cc3cc635 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 20 Nov 2020 11:56:13 -0500 Subject: [PATCH 094/185] Build cross in pipeline, and enable cross packages on Mac --- eng/pipelines/runtime.yml | 2 +- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e84d08e83ef474..ca8767b82d77aa 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BuildMonoCrossAOT=true timeoutInMinutes: 120 condition: >- or( diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index 2b37161c494e3a..f1515dd2c3be6c 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -9,7 +9,7 @@ Microsoft.NETCore.App.MonoCrossAOT.$(RuntimeIdentifier).targeting.$(TargetCrossRid) dotnet-monocrossaot monocrossaot - linux-x64 + linux-x64;osx-x64 false AddRuntimeFilesToPackage; From 2364432941eac0ffa9f2193868205c59cded79d7 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 20 Nov 2020 12:03:28 -0500 Subject: [PATCH 095/185] Nope, build cross on osx_x64 job, not android_x64 job --- eng/pipelines/runtime.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index ca8767b82d77aa..14ae880ef03f72 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BuildMonoCrossAOT=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( @@ -563,6 +563,7 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: + buildArgs: /p:BuildMonoCrossAOT=true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From b30055d2d7ac7f2139697b460c5babd307883d14 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 20 Nov 2020 16:30:57 -0500 Subject: [PATCH 096/185] Release not debug? --- eng/pipelines/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 14ae880ef03f72..30b6c52f182bbc 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -587,6 +587,7 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: + buildArgs: /p:BuildMonoCrossAOT=true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From a9d8fe8684ddcacd4517868bafe16abbd0f3fa35 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 23 Nov 2020 08:46:10 -0500 Subject: [PATCH 097/185] Fix old-style Android build --- eng/Subsets.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index b28fffc4cf2813..c22e0b4befd496 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -203,7 +203,7 @@ - + From d7459655e01744cc5dbdddc6542aed4ca67993a7 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 24 Nov 2020 13:34:11 -0500 Subject: [PATCH 098/185] Workaround for x86 builds --- src/mono/llvm/llvm-init.proj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index 99ee504a71cce9..25590372a6daf5 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -22,6 +22,11 @@ $(HostArch) + + + x64 + + From e06f503271e24043ef595908e4960ecb1dadad74 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 24 Nov 2020 14:09:09 -0500 Subject: [PATCH 099/185] Try something else --- src/mono/llvm/llvm-init.proj | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index 25590372a6daf5..e98bc16cd6e166 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -22,17 +22,12 @@ $(HostArch) - - - x64 - - - - + + From e9bf809bd5147c7b177a4551ab8579534ba7f62f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 24 Nov 2020 14:43:06 -0500 Subject: [PATCH 100/185] Mumble mumble --- src/mono/llvm/llvm-init.proj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index e98bc16cd6e166..8908c3dc49d969 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -23,11 +23,11 @@ - - + + - - + + From 5535a44d75561492e1d0d44c512b7ea5aaf4ae2c Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 24 Nov 2020 15:42:27 -0500 Subject: [PATCH 101/185] Gosh darn it --- src/mono/llvm/llvm-init.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index 8908c3dc49d969..b4ee8cbcb6e900 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -23,8 +23,8 @@ - - + + From c86e5a3038f2b01d21d3c5b5cca34924a187f162 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:02:13 -0500 Subject: [PATCH 102/185] Rename android offset file to help disambiguate --- src/mono/mono.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 0844b7ced9fd3a..b9148ce0f357d2 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -368,7 +368,7 @@ armv7-none-linux-androideabi i686-none-linux-android x86_64-none-linux-android - $(MonoObjDir)cross/offsets-$(Platform).h + $(MonoObjDir)cross/offsets-$(Platform)-android.h From dd5ae102774a5586108f936f4fbac73c9e74223e Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:02:30 -0500 Subject: [PATCH 103/185] Create a new property which can generate offsets only --- src/mono/mono.proj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index b9148ce0f357d2..404b037db11c7a 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -417,9 +417,9 @@ - + - + @@ -479,14 +479,15 @@ + Condition="'$(MonoGenerateOffsetsOnly)' != 'true' and ('$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsBrowser)' == 'true')"/> - + From 1bed2aa9182b7635c8cb014e8b17f9f513b0ebe0 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:04:17 -0500 Subject: [PATCH 104/185] Revert "Nope, build cross on osx_x64 job, not android_x64 job" This reverts commit 2364432941eac0ffa9f2193868205c59cded79d7. --- eng/pipelines/runtime.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 30b6c52f182bbc..14ae880ef03f72 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -587,7 +587,6 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: - buildArgs: /p:BuildMonoCrossAOT=true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From 8dbed7562475cf44a4c65a91934d82b7bca5cc77 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:05:52 -0500 Subject: [PATCH 105/185] Revert "Nope, build cross on osx_x64 job, not android_x64 job" This reverts commit 2364432941eac0ffa9f2193868205c59cded79d7. --- eng/pipelines/runtime.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 14ae880ef03f72..ca8767b82d77aa 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BuildMonoCrossAOT=true timeoutInMinutes: 120 condition: >- or( @@ -563,7 +563,6 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: - buildArgs: /p:BuildMonoCrossAOT=true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From fa40514d6137a3d557e01d72944cb10737cecf70 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:06:43 -0500 Subject: [PATCH 106/185] Clean up more pipeline errors --- eng/pipelines/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index ca8767b82d77aa..e84d08e83ef474 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BuildMonoCrossAOT=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( From 750cffcd8eb815ccab37f62ebb6230b96ae1e7b1 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:15:30 -0500 Subject: [PATCH 107/185] Add new yaml branch for generating offset files --- .../mono/templates/generate-offsets.yml | 104 ++++++++++++++++++ eng/pipelines/runtime.yml | 20 ++++ 2 files changed, 124 insertions(+) create mode 100644 eng/pipelines/mono/templates/generate-offsets.yml diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml new file mode 100644 index 00000000000000..7acfd5e45d7f2b --- /dev/null +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -0,0 +1,104 @@ +parameters: + buildConfig: '' + archType: '' + osGroup: '' + osSubgroup: '' + platform: '' + container: '' + timeoutInMinutes: '' + variables: {} + pool: '' + condition: true + runtimeVariant: '' + isOfficialBuild: false + crossBuild: false + crossrootfsDir: '' + +### Product build +jobs: +- template: xplat-pipeline-job.yml + parameters: + buildConfig: ${{ parameters.buildConfig }} + archType: ${{ parameters.archType }} + osGroup: ${{ parameters.osGroup }} + osSubgroup: ${{ parameters.osSubgroup }} + helixType: 'build/product/' + enableMicrobuild: true + pool: ${{ parameters.pool }} + runtimeVariant: ${{ parameters.runtimeVariant }} + crossBuild: ${{ parameters.crossBuild }} + crossrootfsDir: ${{ parameters.crossroofsDir }} + condition: ${{ parameters.condition }} + + # Compute job name from template parameters + name: ${{ format('mono_{0}_offsets_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + displayName: ${{ format('Mono {0} AOT offsets {1}{2} {3} {4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + + # Run all steps in the container. + # Note that the containers are defined in platform-matrix.yml + container: ${{ parameters.container }} + + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + gatherAssetManifests: true + variables: + - name: osGroup + value: ${{ parameters.osGroup }} + - name: osSubgroup + value: ${{ parameters.osSubgroup }} + - name: officialBuildIdArg + value: '' + - name: osOverride + value: '' + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - name: officialBuildIdArg + value: '/p:officialBuildId=$(Build.BuildNumber)' + - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}: + # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to + # lowercase for RID format. (Detection normally converts, but we're preventing it.) + - name: OutputRidArg + value: /p:OutputRid=linux-musl-${{ parameters.archType }} + - name: _PortableBuild + value: true + - name: osOverride + value: -os Linux + - name: archType + value: x64 + - ${{ parameters.variables }} + + steps: + + # Install native dependencies + # Linux builds use docker images with dependencies preinstalled, + # and FreeBSD builds use a build agent with dependencies + # preinstalled, so we only need this step for OSX and Windows. + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO + displayName: Install native dependencies + - ${{ if eq(parameters.osGroup, 'windows') }}: + # Necessary to install python + - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force + displayName: Install native dependencies + + # Build + - ${{ if ne(parameters.osGroup, 'windows') }}: + - script: ./build$(scriptExt) -subset mono.aotcross -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoGenerateOffsetsOnly=true + displayName: Build product + - ${{ if eq(parameters.osGroup, 'windows') }}: + - script: build$(scriptExt) -subset mono.aotcross -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoGenerateOffsetsOnly=true + displayName: Build product + + # Upload offset files + - task: PublishPipelineArtifact@1 + displayName: Upload offset files + inputs: + targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/**/cross/offsets-*.h + + # Publish Logs + - task: PublishPipelineArtifact@1 + displayName: Publish Logs + inputs: + targetPath: $(Build.SourcesDirectory)/artifacts/log + artifactName: 'BuildLogs_Mono_Offsets_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' + continueOnError: true + condition: always() diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e84d08e83ef474..4ccee43d1730bb 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -254,6 +254,26 @@ jobs: eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) +# Build Mono AOT offset headers once, for consumption elsewhere +# Only when libraries, mono or installer are changed +# +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml + buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + runtimeFlavor: mono + platforms: + - Android_x64 + jobParameters: + testGroup: innerloop + nameSuffix: Offsets_Mono + condition: >- + or( + eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(variables['isFullMatrix'], true)) + # Build the whole product using Mono runtime # Only when libraries, mono or installer are changed # From 27b865f5fd12a9adb5732871fac35cd42e0ffca9 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 14:56:20 -0500 Subject: [PATCH 108/185] Fix sysroot setting --- eng/pipelines/mono/templates/generate-offsets.yml | 3 ++- src/mono/mono.proj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 7acfd5e45d7f2b..1db2ac25179e4f 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -92,7 +92,8 @@ jobs: - task: PublishPipelineArtifact@1 displayName: Upload offset files inputs: - targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/**/cross/offsets-*.h + targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/ + archiveFilePatterns: **/offsets-*-android.h # Publish Logs - task: PublishPipelineArtifact@1 diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 5217c15c988e68..b52c6a00750116 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -367,7 +367,7 @@ true - $(ANDROID_NDK_ROOT)/sysroot + $(ANDROID_NDK_ROOT)/sysroot aarch64-v8a-linux-android armv7-none-linux-androideabi i686-none-linux-android From 1419d79aef05fcd20b1bb1cce91a892dfd78ea3d Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 15:51:12 -0500 Subject: [PATCH 109/185] Missing escaping --- eng/pipelines/mono/templates/generate-offsets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 1db2ac25179e4f..c3aeb09725a43c 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -93,7 +93,7 @@ jobs: displayName: Upload offset files inputs: targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/ - archiveFilePatterns: **/offsets-*-android.h + archiveFilePatterns: '**/offsets-*-android.h' # Publish Logs - task: PublishPipelineArtifact@1 From 276e9f7057666b308d996366177c9d8221ecf889 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 16:28:38 -0500 Subject: [PATCH 110/185] Why can't PublishPipelineArtifact do wildcards>?! --- eng/pipelines/mono/templates/generate-offsets.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index c3aeb09725a43c..8f8e2d9da74c1f 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -89,11 +89,18 @@ jobs: displayName: Build product # Upload offset files + - task: CopyFiles@2 + displayName: Collect offset files + inputs: + sourceFolder: '$(Build.SourcesDirectory)'/artifacts/obj/mono/ + contents: '**/offsets-*-android.h' + targetFolder: '$(Build.SourcesDirectory)'/artifacts/obj/monooffsetfiles/' + - task: PublishPipelineArtifact@1 displayName: Upload offset files inputs: - targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/ - archiveFilePatterns: '**/offsets-*-android.h' + targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles + artifactName: 'Mono_Offsets_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' # Publish Logs - task: PublishPipelineArtifact@1 From 342dc03c7843f0854a3f6b4774f1b4e48cd38345 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Sun, 29 Nov 2020 16:31:57 -0500 Subject: [PATCH 111/185] Fic typos --- eng/pipelines/mono/templates/generate-offsets.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 8f8e2d9da74c1f..cb7bfde683696d 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -92,14 +92,14 @@ jobs: - task: CopyFiles@2 displayName: Collect offset files inputs: - sourceFolder: '$(Build.SourcesDirectory)'/artifacts/obj/mono/ + sourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/mono/' contents: '**/offsets-*-android.h' - targetFolder: '$(Build.SourcesDirectory)'/artifacts/obj/monooffsetfiles/' + targetFolder: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles/' - task: PublishPipelineArtifact@1 displayName: Upload offset files inputs: - targetPath: $(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles + targetPath: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' artifactName: 'Mono_Offsets_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' # Publish Logs From 4107a1c13f19103cc299b0d469cfd0535de299f5 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 08:50:48 -0500 Subject: [PATCH 112/185] See if dependencies work --- eng/pipelines/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 4ccee43d1730bb..d08bff84c9f111 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -583,6 +583,7 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: + dependsOn: mono__offsets_Android_x64_debug condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From 04ad8b4ed83531d76d2e8485df3bb2ada0f7e978 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 09:00:47 -0500 Subject: [PATCH 113/185] Ensure Mono jobs pass through dependsOn --- eng/pipelines/mono/templates/build-job.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 6b601d83c050b8..295762f85bfa28 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -13,6 +13,7 @@ parameters: isOfficialBuild: false crossBuild: false crossrootfsDir: '' + dependsOn: '' ### Product build jobs: @@ -38,6 +39,7 @@ jobs: # Note that the containers are defined in platform-matrix.yml container: ${{ parameters.container }} + dependsOn: ${{ parameters.dependsOn }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} gatherAssetManifests: true From 5850b22bc66c1a4270322a23253443168df8d3bd Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 14:45:03 -0500 Subject: [PATCH 114/185] Try adding AotCross to build. This should fail as we don't consume offsets yet --- eng/pipelines/mono/templates/build-job.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 295762f85bfa28..b96285210fab2a 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -85,6 +85,9 @@ jobs: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - name: llvmParameter value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true $(llvmCxxAbi) + - ${{ if and(eq(parameters.runtimeVariant, ''), eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'x64')) }}: + - name: aotCrossParameter + value: /p:BuildMonoCrossAOT=true - ${{ parameters.variables }} steps: @@ -109,10 +112,10 @@ jobs: # Build - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) + - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(AotCrossParameter) $(llvmParameter) displayName: Build product - ${{ if eq(parameters.osGroup, 'windows') }}: - - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) + - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(AotCrossParameter) $(llvmParameter) displayName: Build product - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: From e828986aae29a9169fda6fef1b95f514181a5907 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 15:19:38 -0500 Subject: [PATCH 115/185] Try downloading offsets --- eng/pipelines/mono/templates/build-job.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index b96285210fab2a..7c06183dc9ddd9 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -104,6 +104,11 @@ jobs: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies + - ${{ if ne(aotCrossParameter, '') }}: + - download: current + artifact: Mono_Offsets__Linux_x64_debug + displayName: Download AOT offset files + - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From cfe027727654ab9184858bee20b85fe0e9add667 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 15:40:36 -0500 Subject: [PATCH 116/185] Don;t hide behind conditional --- eng/pipelines/mono/templates/build-job.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 7c06183dc9ddd9..33635938a7bdd7 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -104,10 +104,9 @@ jobs: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - - ${{ if ne(aotCrossParameter, '') }}: - - download: current - artifact: Mono_Offsets__Linux_x64_debug - displayName: Download AOT offset files + - download: current + artifact: Mono_Offsets__Linux_x64_debug + displayName: Download AOT offset files - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | From a9b74f4b69e74a227699b66d9b9e8099b9b998e6 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 16:21:48 -0500 Subject: [PATCH 117/185] Fix offset aertifact name --- eng/pipelines/mono/templates/build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 33635938a7bdd7..12d1de27c00318 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -105,7 +105,7 @@ jobs: displayName: Install native dependencies - download: current - artifact: Mono_Offsets__Linux_x64_debug + artifact: Mono_Offsets__Android_x64_Debug displayName: Download AOT offset files - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: From 99993bff7ba0290236fdf93a6ca7eceb3a643c3d Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 16:50:55 -0500 Subject: [PATCH 118/185] Download to correct place --- eng/pipelines/mono/templates/build-job.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 12d1de27c00318..73cb837e6bc37e 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -104,9 +104,11 @@ jobs: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - - download: current - artifact: Mono_Offsets__Android_x64_Debug + - task: DownloadPipelineArtifact@2 displayName: Download AOT offset files + inputs: + artifact: Mono_Offsets__Android_x64_Debug + path: '$(Build.SourcesDirectory)\artifacts\obj\monooffsetfiles' - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | From f5b60a0ec3bb6468f6d2aa5d0b68118872fa43d6 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 30 Nov 2020 17:28:37 -0500 Subject: [PATCH 119/185] Copy offset file where it needs to be --- src/mono/mono.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index b52c6a00750116..f4fd06dc20fc39 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -416,10 +416,13 @@ <_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration) <_MonoAotCMakeBuildCommand Condition="'$(MonoVerboseBuild)' == 'true'">$(_MonoAotCMakeBuildCommand) --verbose <_MonoAotCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoAotCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount) + <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)') + + From a7ad24305b107315b45726ea258448b0e98a5fd6 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 08:16:32 -0500 Subject: [PATCH 120/185] debug --- eng/pipelines/mono/templates/build-job.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 73cb837e6bc37e..6bf3b6a382489f 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -110,6 +110,10 @@ jobs: artifact: Mono_Offsets__Android_x64_Debug path: '$(Build.SourcesDirectory)\artifacts\obj\monooffsetfiles' + - script: | + find $(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles -type f + displayName: debug + - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From fd8cbde1e23ff0aba962b4f7b9bc91e98407934a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 11:53:27 -0500 Subject: [PATCH 121/185] add debug, fix path --- src/mono/mono.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index f4fd06dc20fc39..1646117a414138 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -416,11 +416,12 @@ <_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration) <_MonoAotCMakeBuildCommand Condition="'$(MonoVerboseBuild)' == 'true'">$(_MonoAotCMakeBuildCommand) --verbose <_MonoAotCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoAotCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount) - <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)') + <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$(PlatformConfigPathPart)\cross\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)') + From 1ea31a88c451387b3822538fbd6101db59fa754f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 12:09:19 -0500 Subject: [PATCH 122/185] typo --- src/mono/mono.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 1646117a414138..8a3c1e6ec9451a 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -421,7 +421,7 @@ - From e7e0fc72d7129a44812e87a5ee8bef72ae6bb7f5 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 13:26:28 -0500 Subject: [PATCH 123/185] Fix escaping --- src/mono/mono.proj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 8a3c1e6ec9451a..d26e4717cc07cd 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -416,13 +416,12 @@ <_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration) <_MonoAotCMakeBuildCommand Condition="'$(MonoVerboseBuild)' == 'true'">$(_MonoAotCMakeBuildCommand) --verbose <_MonoAotCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoAotCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount) - <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$(PlatformConfigPathPart)\cross\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)') + <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$(PlatformConfigPathPart)\cross\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)')) - - + From 99a3bb3f046fadbd589efe608c9eef208627ca90 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 16:23:11 -0500 Subject: [PATCH 124/185] Fix building cross compilers with no NDK, but an offset file --- eng/pipelines/mono/templates/build-job.yml | 2 +- src/mono/mono.proj | 8 ++++---- src/mono/monoaotcross.proj | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 6bf3b6a382489f..dc3e852c824628 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -87,7 +87,7 @@ jobs: value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true $(llvmCxxAbi) - ${{ if and(eq(parameters.runtimeVariant, ''), eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'x64')) }}: - name: aotCrossParameter - value: /p:BuildMonoCrossAOT=true + value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true - ${{ parameters.variables }} steps: diff --git a/src/mono/mono.proj b/src/mono/mono.proj index d26e4717cc07cd..e683853f676003 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -64,7 +64,7 @@ - + @@ -320,8 +320,8 @@ - - + + @@ -422,7 +422,7 @@ - + diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 5bf00140f29c62..32f6da32efe16b 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -27,7 +27,7 @@ + Properties="MonoAotCrossTarget='$(MonoAotTargets)';BuildMonoAOTCrossCompilerOnly=true;_SkipMonoCrossJitConfigure=$(SkipMonoCrossJitConfigure);TargetArchitecture=$(MonoAotTargetArchitecture);TargetOS=$(MonoAotTargetOS)" /> <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid)\**" /> From 2f9a661e7d214a2fd6e91a5eefc89f2adec43097 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 1 Dec 2020 16:44:52 -0500 Subject: [PATCH 125/185] Get rid of debug noise --- eng/pipelines/mono/templates/build-job.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index dc3e852c824628..e01cd05ad8b7a8 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -110,10 +110,6 @@ jobs: artifact: Mono_Offsets__Android_x64_Debug path: '$(Build.SourcesDirectory)\artifacts\obj\monooffsetfiles' - - script: | - find $(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles -type f - displayName: debug - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From 7e00e410af23a23d0c94677b4380a56b7431d951 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 13:00:03 -0500 Subject: [PATCH 126/185] Fix noise on Windows --- eng/pipelines/mono/templates/build-job.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index e01cd05ad8b7a8..fd5e2b86aa05f6 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -52,6 +52,10 @@ jobs: value: '' - name: osOverride value: '' + - name: aotCrossParameter + value: '' + - name: llvmParameter + value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' From 352c0e8e399a53b0b9cb6068183ed6e0f34963ec Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 13:03:15 -0500 Subject: [PATCH 127/185] Build cross on correct platforms --- eng/pipelines/mono/templates/build-job.yml | 4 +++- eng/pipelines/runtime.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index fd5e2b86aa05f6..8bf2d251891039 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -13,6 +13,7 @@ parameters: isOfficialBuild: false crossBuild: false crossrootfsDir: '' + buildCross: false dependsOn: '' ### Product build @@ -28,6 +29,7 @@ jobs: pool: ${{ parameters.pool }} runtimeVariant: ${{ parameters.runtimeVariant }} crossBuild: ${{ parameters.crossBuild }} + buildCross: ${{ parameters.buildCross }} crossrootfsDir: ${{ parameters.crossroofsDir }} condition: ${{ parameters.condition }} @@ -89,7 +91,7 @@ jobs: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - name: llvmParameter value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true $(llvmCxxAbi) - - ${{ if and(eq(parameters.runtimeVariant, ''), eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'x64')) }}: + - ${{ if eq(parameters.buildCross, 'android') }}: - name: aotCrossParameter value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true - ${{ parameters.variables }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 3a6c9603a7dbae..b0493698809dd5 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -473,6 +473,7 @@ jobs: # - windows_arm64 jobParameters: dependsOn: mono__offsets_Android_x64_debug + buildCross: android condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), From f849ee19030ed751c71b1183cefafea51b12e3a4 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 13:05:25 -0500 Subject: [PATCH 128/185] Build all android targets --- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 2 +- src/mono/monoaotcross.proj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index aacc5309de4850..93ff1018e43c7d 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -1,6 +1,6 @@ - android-x64;android-arm64 + android-x64;android-arm64;android-x86;android-arm $(MonoAotDefaultTargets) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 32f6da32efe16b..2d72cbea87b220 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,6 +1,6 @@ - android-x64;android-arm64 + android-x64;android-arm64;android-x86;android-arm $(MonoAotDefaultTargets) From 10d9b357cd567b3597fc829879b5a4cd2374278f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 14:23:52 -0500 Subject: [PATCH 129/185] Try and work around llvm-config not being found on windows --- src/mono/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index 08298000017ca4..cfa5bafc124fc7 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -230,6 +230,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") set(HAVE_SYS_RANDOM_H 1) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(HOST_WIN32 1) + set(EXE_SUFFIX ".exe") set(DISABLE_CRASH_REPORTING 1) set(DISABLE_PORTABILITY 1) set(HOST_NO_SYMLINKS 1) @@ -481,7 +482,7 @@ if(LLVM_PREFIX) set(llvm_libs ${llvm_core_libs} ${llvm_extra}) else() - set(LLVM_CONFIG ${LLVM_PREFIX}/bin/llvm-config) + set(LLVM_CONFIG ${LLVM_PREFIX}/bin/llvm-config${EXE_SUFFIX}) if (NOT EXISTS ${LLVM_CONFIG}) message(FATAL_ERROR "LLVM executable '${LLVM_CONFIG}' not found.") endif() From b47099cf540e9142a3d26b49dd6ae0987236b6aa Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 16:42:46 -0500 Subject: [PATCH 130/185] Revert "Get rid of debug noise" This reverts commit 2f9a661e7d214a2fd6e91a5eefc89f2adec43097. --- eng/pipelines/mono/templates/build-job.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 8bf2d251891039..f8b61fef1e97d5 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -116,6 +116,10 @@ jobs: artifact: Mono_Offsets__Android_x64_Debug path: '$(Build.SourcesDirectory)\artifacts\obj\monooffsetfiles' + - script: | + find $(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles -type f + displayName: debug + - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From a970b07314e286c8b15681a903649322270b71c9 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 16:44:29 -0500 Subject: [PATCH 131/185] More debug spew, osx should be working --- src/mono/mono.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 2c414d12e6922e..658b95637420f4 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -433,6 +433,7 @@ + From 957dfd5d1f29e3900963912a113a25e265552072 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 16:55:25 -0500 Subject: [PATCH 132/185] tpyo --- src/mono/mono.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 658b95637420f4..02237f74c17083 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -433,7 +433,7 @@ - From 7a6a0c2bc5d26706fb88e30ef69292eae18256c5 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 17:50:43 -0500 Subject: [PATCH 133/185] tweaky --- eng/pipelines/mono/templates/build-job.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index f8b61fef1e97d5..bc0085b74cd51f 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -110,14 +110,15 @@ jobs: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - - task: DownloadPipelineArtifact@2 - displayName: Download AOT offset files - inputs: - artifact: Mono_Offsets__Android_x64_Debug - path: '$(Build.SourcesDirectory)\artifacts\obj\monooffsetfiles' + - ${{ if eq(parameters.buildCross, 'android') }}: + - task: DownloadPipelineArtifact@2 + displayName: Download AOT offset files + inputs: + artifact: Mono_Offsets__Android_x64_Debug + path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' - script: | - find $(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles -type f + find $(Build.SourcesDirectory) -name \*offset\*h displayName: debug - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: From 9a9094a6f058d22607036392f0a10e968145aa95 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 2 Dec 2020 18:23:40 -0500 Subject: [PATCH 134/185] Get rid of a debug output --- eng/pipelines/mono/templates/build-job.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index bc0085b74cd51f..e3f650e154cfaf 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -117,10 +117,6 @@ jobs: artifact: Mono_Offsets__Android_x64_Debug path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' - - script: | - find $(Build.SourcesDirectory) -name \*offset\*h - displayName: debug - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From 27a4243955eece12ee23e72a5c90ffce9e766e14 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 4 Dec 2020 08:25:04 -0500 Subject: [PATCH 135/185] Shelve fixing Windows and non-x64 hosts for now, get what works fully working --- eng/pipelines/runtime.yml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 4e2327559a74a0..9fef21b3e375de 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -463,14 +463,40 @@ jobs: runtimeFlavor: mono buildConfig: debug platforms: - - OSX_x64 - - Linux_x64 + # - OSX_x64 + # - Linux_x64 - Linux_arm64 # - Linux_musl_arm64 - windows_x64 - windows_x86 # - windows_arm # - windows_arm64 + jobParameters: + dependsOn: mono__offsets_Android_x64_debug + condition: >- + or( + eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(variables['isFullMatrix'], true)) + +# +# Build Mono debug, with Android AOT cross-compilers +# Only when libraries or mono changed +# +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/mono/templates/build-job.yml + runtimeFlavor: mono + buildConfig: debug + platforms: + - OSX_x64 + - Linux_x64 + # - Linux_arm64 + # - Linux_musl_arm64 + # - windows_x64 + # - windows_x86 + # - windows_arm + # - windows_arm64 jobParameters: dependsOn: mono__offsets_Android_x64_debug buildCross: android From 5ad26c3df0b5463e8efd6013c5cea3a38af1a965 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 4 Dec 2020 10:44:26 -0500 Subject: [PATCH 136/185] Remove debug spew --- src/mono/mono.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 02237f74c17083..2c414d12e6922e 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -433,7 +433,6 @@ - From 447b04c75518b40a72b92693ae2621705a63be95 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 4 Dec 2020 14:45:55 -0500 Subject: [PATCH 137/185] Make LLVM AOT compatible with new path structure? --- src/tests/run.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/run.proj b/src/tests/run.proj index 1841c69bc5e63c..0adb47f5d199f4 100644 --- a/src/tests/run.proj +++ b/src/tests/run.proj @@ -378,8 +378,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). $(MonoBinDir) - $(MonoBinDir)/cross/mono-aot-cross - $(MonoBinDir)/cross + $(MonoBinDir)/cross/$(PackageRID)/mono-aot-cross + $(MonoBinDir)/cross/$(PackageRID) From 6b4ae149b01340c9c54891be2810a676438fbdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 23 Dec 2020 23:15:02 +0100 Subject: [PATCH 138/185] Simplify logic --- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 5 ++--- src/mono/mono.proj | 6 +++--- src/mono/monoaotcross.proj | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index 93ff1018e43c7d..94e6379426ac93 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -1,7 +1,6 @@ - android-x64;android-arm64;android-x86;android-arm - $(MonoAotDefaultTargets) + android-x64;android-arm64;android-x86;android-arm @@ -23,6 +22,6 @@ + Properties="TargetCrossRid=$(MonoAotTargetRid)" /> diff --git a/src/mono/mono.proj b/src/mono/mono.proj index b86d6806c063fb..a85cee657c5c8a 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -64,7 +64,7 @@ - + @@ -329,8 +329,8 @@ - - + + diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 2d72cbea87b220..66a57cf25e8c00 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,7 +1,6 @@ - android-x64;android-arm64;android-x86;android-arm - $(MonoAotDefaultTargets) + android-x64;android-arm64;android-x86;android-arm @@ -27,7 +26,7 @@ + Properties="BuildMonoAOTCrossCompilerOnly=true;SkipMonoCrossJitConfigure=$(SkipMonoCrossJitConfigure);TargetArchitecture=$(MonoAotTargetArchitecture);TargetOS=$(MonoAotTargetOS)" /> <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid)\**" /> From 79cd4071e3497683d72cbe1b21fc493d1c6c267e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 23 Dec 2020 23:34:21 +0100 Subject: [PATCH 139/185] Fix Android sample app --- .../netcore/sample/Android/AndroidSampleApp.csproj | 10 ++++------ src/mono/netcore/sample/Android/Makefile | 6 ++++-- src/mono/netcore/sample/iOS/Makefile | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj index 481d38d0ea11b1..8e5f6967833b3e 100644 --- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj @@ -20,9 +20,9 @@ - + - + @@ -60,8 +60,8 @@ - diff --git a/src/mono/netcore/sample/Android/Makefile b/src/mono/netcore/sample/Android/Makefile index 2c22d9f1e5d6d1..95cd37aa7cb32d 100644 --- a/src/mono/netcore/sample/Android/Makefile +++ b/src/mono/netcore/sample/Android/Makefile @@ -1,6 +1,8 @@ MONO_CONFIG=Release MONO_ARCH=x64 DOTNET := ../../../../.././dotnet.sh +USE_LLVM=true +FORCE_AOT=false all: runtimepack run @@ -13,8 +15,8 @@ run: /p:TargetOS=Android \ /p:Configuration=$(MONO_CONFIG) \ /p:DeployAndRun=true \ - /p:UseAotForSimulator=true \ - /p:UseLLVM=true \ + /p:ForceAOT=$(FORCE_AOT) \ + /p:UseLLVM=$(USE_LLVM) \ /p:RunActivity=false clean: diff --git a/src/mono/netcore/sample/iOS/Makefile b/src/mono/netcore/sample/iOS/Makefile index fba4697ced585b..ff280e3411c7be 100644 --- a/src/mono/netcore/sample/iOS/Makefile +++ b/src/mono/netcore/sample/iOS/Makefile @@ -1,7 +1,8 @@ MONO_CONFIG=Debug MONO_ARCH=x64 DOTNET := ../../../../.././dotnet.sh -USE_LLVM=True +USE_LLVM=true +FORCE_AOT=false all: runtimepack run @@ -15,7 +16,7 @@ runtimepack: run: clean appbuilder $(DOTNET) publish -c $(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=$(USE_LLVM) /p:ForceAOT=false + /p:UseLLVM=$(USE_LLVM) /p:ForceAOT=$(FORCE_AOT) clean: rm -rf bin From 25e59bf4aa37c6eec1c0763ab464962448bc689c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 23 Dec 2020 23:59:04 +0100 Subject: [PATCH 140/185] Fix including the mono-cross-aot in the live-built runtime pack Also put llvm binaries into a non-RID folder since llvm can target multiple platforms. --- eng/liveBuilds.targets | 2 +- .../Microsoft.NETCore.App.Runtime.sfxproj | 2 +- src/libraries/externals.csproj | 2 +- src/mono/mono.proj | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index bd0f901c75a958..fdd514b46dc512 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -107,7 +107,7 @@ + Include="$(MonoArtifactsPath)\cross\**\*.*" /> diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index bb13901672499b..0619146e1b898e 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -77,7 +77,7 @@ - runtimes/$(RuntimeIdentifier)/native/cross + runtimes/$(RuntimeIdentifier)/native/cross/%(RecursiveDir) + DestinationSubDirectory="cross/%(RecursiveDir)" /> diff --git a/src/mono/mono.proj b/src/mono/mono.proj index a85cee657c5c8a..3814eb2e3b9dab 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -489,7 +489,7 @@ $(RuntimeBinDir)$(MonoStaticFileName) <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)"> - $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\mono-aot-cross + $(RuntimeBinDir)cross\$(PackageRID)\mono-aot-cross <_MonoRuntimeArtifacts Condition="'$(MonoBundleLLVMOptimizer)' == 'true'" Include="$(MonoLLVMDir)\bin\llc"> $(RuntimeBinDir)\llc @@ -498,10 +498,10 @@ $(RuntimeBinDir)\opt <_MonoRuntimeArtifacts Condition="'$(MonoAOTBundleLLVMOptimizer)' == 'true'" Include="$(MonoAOTLLVMDir)\bin\llc"> - $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\llc + $(RuntimeBinDir)cross\$(PackageRID)\llc <_MonoRuntimeArtifacts Condition="'$(MonoAOTBundleLLVMOptimizer)' == 'true'" Include="$(MonoAOTLLVMDir)\bin\opt"> - $(RuntimeBinDir)cross\$(TargetOS)-$(TargetArchitecture)\opt + $(RuntimeBinDir)cross\$(PackageRID)\opt <_MonoIncludeArtifacts Include="$(MonoObjDir)out\include\**" /> <_MonoRuntimeArtifacts Condition="'$(_MonoIncludeInterpStaticFiles)' == 'true'" Include="$(MonoObjDir)out\lib\libmono-ee-interp.a"> From 60c7cef53a933d84218aee7be0c542863e85463e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 24 Dec 2020 00:10:51 +0100 Subject: [PATCH 141/185] Revert changes to MonoAOTCompiler.props --- src/tasks/AotCompilerTask/MonoAOTCompiler.props | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index ee37597effd933..db518b2e8455da 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -10,10 +10,8 @@ - - - + From 9643bacd2d7847c560f3012c32be2d87f1f08d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 24 Dec 2020 00:18:35 +0100 Subject: [PATCH 142/185] Revert unnecessary change --- src/installer/pkg/sfx/installers.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj index 8c9e68c1bbf5ee..5e7d5908d7a565 100644 --- a/src/installer/pkg/sfx/installers.proj +++ b/src/installer/pkg/sfx/installers.proj @@ -23,4 +23,4 @@ Targets="GenerateInstallers" SkipNonexistentTargets="true" /> - + \ No newline at end of file From 29e8f5eacd9171b2fd566acd17d91e8b92fd792b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 24 Dec 2020 00:49:35 +0100 Subject: [PATCH 143/185] Simplify and fix .yml --- eng/pipelines/mono/templates/build-job.yml | 16 ++++---- .../mono/templates/generate-offsets.yml | 39 +++++-------------- eng/pipelines/runtime.yml | 31 ++++++--------- 3 files changed, 29 insertions(+), 57 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 161c1bcb1fddbb..e055086eaf9032 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -15,7 +15,7 @@ parameters: crossrootfsDir: '' dependOnEvaluatePaths: false dependsOn: '' - buildCross: false + monoCrossAOTTargetOS: '' ### Product build jobs: @@ -30,7 +30,7 @@ jobs: pool: ${{ parameters.pool }} runtimeVariant: ${{ parameters.runtimeVariant }} crossBuild: ${{ parameters.crossBuild }} - buildCross: ${{ parameters.buildCross }} + monoCrossAOTTargetOS: ${{ parameters.monoCrossAOTTargetOS }} crossrootfsDir: ${{ parameters.crossroofsDir }} condition: ${{ parameters.condition }} dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} @@ -93,9 +93,9 @@ jobs: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - name: llvmParameter value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true $(llvmCxxAbi) - - ${{ if eq(parameters.buildCross, 'android') }}: + - ${{ if eq(parameters.monoCrossAOTTargetOS, 'Android') }}: - name: aotCrossParameter - value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true + value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true - ${{ parameters.variables }} steps: @@ -112,11 +112,11 @@ jobs: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - - ${{ if eq(parameters.buildCross, 'android') }}: + - ${{ if eq(parameters.monoCrossAOTTargetOS, 'Android') }}: - task: DownloadPipelineArtifact@2 displayName: Download AOT offset files inputs: - artifact: Mono_Offsets__Android_x64_Debug + artifact: Mono_Offsets_Android path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: @@ -127,10 +127,10 @@ jobs: # Build - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(AotCrossParameter) $(llvmParameter) + - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) displayName: Build product - ${{ if eq(parameters.osGroup, 'windows') }}: - - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(AotCrossParameter) $(llvmParameter) + - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) displayName: Build product - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index cb7bfde683696d..cdcb2b22635a61 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -1,38 +1,28 @@ parameters: - buildConfig: '' - archType: '' osGroup: '' - osSubgroup: '' platform: '' container: '' timeoutInMinutes: '' variables: {} pool: '' condition: true - runtimeVariant: '' isOfficialBuild: false - crossBuild: false - crossrootfsDir: '' ### Product build jobs: - template: xplat-pipeline-job.yml parameters: - buildConfig: ${{ parameters.buildConfig }} - archType: ${{ parameters.archType }} + buildConfig: Debug osGroup: ${{ parameters.osGroup }} - osSubgroup: ${{ parameters.osSubgroup }} helixType: 'build/product/' enableMicrobuild: true pool: ${{ parameters.pool }} - runtimeVariant: ${{ parameters.runtimeVariant }} - crossBuild: ${{ parameters.crossBuild }} - crossrootfsDir: ${{ parameters.crossroofsDir }} condition: ${{ parameters.condition }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters - name: ${{ format('mono_{0}_offsets_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - displayName: ${{ format('Mono {0} AOT offsets {1}{2} {3} {4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + name: ${{ format('mono_{0}_offsets', parameters.osGroup) }} + displayName: ${{ format('Mono {0} AOT offsets', parameters.osGroup) }} # Run all steps in the container. # Note that the containers are defined in platform-matrix.yml @@ -44,22 +34,11 @@ jobs: variables: - name: osGroup value: ${{ parameters.osGroup }} - - name: osSubgroup - value: ${{ parameters.osSubgroup }} - name: officialBuildIdArg value: '' - - name: osOverride - value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' - - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}: - # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to - # lowercase for RID format. (Detection normally converts, but we're preventing it.) - - name: OutputRidArg - value: /p:OutputRid=linux-musl-${{ parameters.archType }} - - name: _PortableBuild - value: true - name: osOverride value: -os Linux - name: archType @@ -83,30 +62,30 @@ jobs: # Build - ${{ if ne(parameters.osGroup, 'windows') }}: - script: ./build$(scriptExt) -subset mono.aotcross -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoGenerateOffsetsOnly=true - displayName: Build product + displayName: Generate AOT offsets - ${{ if eq(parameters.osGroup, 'windows') }}: - script: build$(scriptExt) -subset mono.aotcross -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoGenerateOffsetsOnly=true - displayName: Build product + displayName: Generate AOT offsets # Upload offset files - task: CopyFiles@2 displayName: Collect offset files inputs: sourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/mono/' - contents: '**/offsets-*-android.h' + contents: '**/offsets-*.h' targetFolder: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles/' - task: PublishPipelineArtifact@1 displayName: Upload offset files inputs: targetPath: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' - artifactName: 'Mono_Offsets_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' + artifactName: 'Mono_Offsets_$(osGroup)' # Publish Logs - task: PublishPipelineArtifact@1 displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'BuildLogs_Mono_Offsets_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' + artifactName: 'BuildLogs_Mono_Offsets_$(osGroup)' continueOnError: true condition: always() diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e7546a104cc5c8..c3bcf79776a017 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -184,23 +184,17 @@ jobs: eq(variables['isFullMatrix'], true)) # Build Mono AOT offset headers once, for consumption elsewhere -# Only when libraries, mono or installer are changed +# Only when mono changed # - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml - buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - runtimeFlavor: mono platforms: - Android_x64 jobParameters: - testGroup: innerloop - nameSuffix: Offsets_Mono condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # Build the whole product using Mono runtime @@ -464,8 +458,8 @@ jobs: runtimeFlavor: mono buildConfig: debug platforms: - # - OSX_x64 - # - Linux_x64 + - OSX_x64 + - Linux_x64 - Linux_arm64 # - Linux_musl_arm64 - windows_x64 @@ -473,22 +467,21 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: - dependsOn: mono__offsets_Android_x64_debug condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # -# Build Mono debug, with Android AOT cross-compilers -# Only when libraries or mono changed +# Build Mono release Android AOT cross-compiler +# Only when mono changed # - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/mono/templates/build-job.yml runtimeFlavor: mono - buildConfig: debug + buildConfig: release platforms: - OSX_x64 - Linux_x64 @@ -499,11 +492,11 @@ jobs: # - windows_arm # - windows_arm64 jobParameters: - dependsOn: mono__offsets_Android_x64_debug - buildCross: android + runtimeVariant: crossandroid + dependsOn: mono_android_offsets + monoCrossAOTTargetOS: Android condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) From 5eeccfbfd0eaaf9cfac7895f8ad6bcee1a134cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 24 Dec 2020 00:49:35 +0100 Subject: [PATCH 144/185] Simplify and fix .yml --- eng/pipelines/mono/templates/build-job.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index e055086eaf9032..9cc85836cfbbc6 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -96,6 +96,8 @@ jobs: - ${{ if eq(parameters.monoCrossAOTTargetOS, 'Android') }}: - name: aotCrossParameter value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + - name: osOverride + value: '-os Android' - ${{ parameters.variables }} steps: From e501d3fcc5eb243af75b05114c5f64cb523eb08a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 08:42:27 -0500 Subject: [PATCH 145/185] If we only build AOT compilers in Release, generate Release offsets --- eng/pipelines/mono/templates/generate-offsets.yml | 3 ++- eng/pipelines/runtime.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index cdcb2b22635a61..c654eeb3540c76 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -1,4 +1,5 @@ parameters: + buildConfig: 'Debug' osGroup: '' platform: '' container: '' @@ -12,7 +13,7 @@ parameters: jobs: - template: xplat-pipeline-job.yml parameters: - buildConfig: Debug + buildConfig: ${{ parameters.buildConfig }} osGroup: ${{ parameters.osGroup }} helixType: 'build/product/' enableMicrobuild: true diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index c3bcf79776a017..99e0ea100aa5a9 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -189,6 +189,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml + buildConfig: release platforms: - Android_x64 jobParameters: From 9b240953ee439257c2eeb27aad62b93273f5b6db Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 09:46:42 -0500 Subject: [PATCH 146/185] Debug? --- src/mono/mono.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 9b6f0c50777868..975a7708128d47 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -436,6 +436,8 @@ + + From cc2e82c63d29f1a6022e9f0927af587892709825 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 10:45:57 -0500 Subject: [PATCH 147/185] This is a horrible workaround --- src/mono/monoaotcross.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 66a57cf25e8c00..a18ab14205273f 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,6 +1,7 @@ - android-x64;android-arm64;android-x86;android-arm + + Android-x64;Android-arm64;Android-x86;Android-arm From 3000673feff552344e96205acb624e7244f72173 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 13:32:34 -0500 Subject: [PATCH 148/185] Rename package --- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index f1515dd2c3be6c..3f1eb8096c1f9a 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -6,7 +6,7 @@ true RuntimePack Microsoft.NETCore.App.MonoCrossAOT - Microsoft.NETCore.App.MonoCrossAOT.$(RuntimeIdentifier).targeting.$(TargetCrossRid) + Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid) dotnet-monocrossaot monocrossaot linux-x64;osx-x64 From 03c41a25b86391901cd35a683d38a442139685c0 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 15:15:14 -0500 Subject: [PATCH 149/185] Remove obsolete debug spew --- src/mono/mono.proj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 975a7708128d47..9b6f0c50777868 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -436,8 +436,6 @@ - - From cb4fa69dd5da7b8d31265bd7b20252d8a32c140a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 15:26:33 -0500 Subject: [PATCH 150/185] New debug spew - this works fine locally, so why broken on azdo? --- eng/pipelines/mono/templates/build-job.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 9cc85836cfbbc6..e59d9af3bbd004 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -141,6 +141,11 @@ jobs: df -h displayName: Disk Usage after Build + - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - script: | + find artifacts/bin -type f + displayName: Why are computers like this + # Publish product output directory for consumption by tests. - template: /eng/pipelines/common/upload-artifact-step.yml parameters: From 081d54e869bb2a6c547e0609279b40f7993877ab Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 16:24:21 -0500 Subject: [PATCH 151/185] More debug --- src/mono/monoaotcross.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index a18ab14205273f..21260d649d2f00 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -33,6 +33,8 @@ <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid)\**" /> + + From 92fe6c8855899000e746a5ececc72bd7fa443f73 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 5 Jan 2021 17:43:41 -0500 Subject: [PATCH 152/185] Stop setting an OS override to Android, it breaks zipping --- eng/pipelines/mono/templates/build-job.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index e59d9af3bbd004..eb7d8ca68a5925 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -96,8 +96,6 @@ jobs: - ${{ if eq(parameters.monoCrossAOTTargetOS, 'Android') }}: - name: aotCrossParameter value: /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true - - name: osOverride - value: '-os Android' - ${{ parameters.variables }} steps: From 0d5d749c03b141d2ede4905b011edae692da893a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 7 Jan 2021 14:59:09 -0500 Subject: [PATCH 153/185] Clean up some packaging errors --- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 14 -------------- .../sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 4 +++- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index 3f1eb8096c1f9a..8f3b7fb26090d4 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -37,18 +37,4 @@ - - - - - - <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" /> - - - - - diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index 94e6379426ac93..cc4fcd7c56822b 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -1,4 +1,6 @@ - + + + android-x64;android-arm64;android-x86;android-arm From c7e96c406546935385be9d8d56536eda424b332f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 8 Jan 2021 14:38:39 -0500 Subject: [PATCH 154/185] Fix AOT on iOS --- eng/testing/tests.mobile.targets | 4 ++-- src/mono/netcore/sample/Android/AndroidSampleApp.csproj | 2 +- src/mono/netcore/sample/iOS/Program.csproj | 4 ++-- .../iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 9ac8dcc27879b4..09b73986e4f13a 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -102,14 +102,14 @@ + LLVMPath="$(MicrosoftNetCoreAppRuntimePackNativeDir)cross\$(PackageRID)"> diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj index 34f1b64e221b06..d096cac023ebac 100644 --- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj @@ -66,7 +66,7 @@ OutputType="AsmOnly" Assemblies="@(AotInputAssemblies)" UseLLVM="$(UseLLVM)" - LLVMPath="$(MicrosoftNetCoreAppRuntimePackDir)native\cross"> + LLVMPath="$(MicrosoftNetCoreAppRuntimePackDir)native\cross\android-$(TargetArchitecture)"> diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj index a873f64da64412..7806e600700509 100644 --- a/src/mono/netcore/sample/iOS/Program.csproj +++ b/src/mono/netcore/sample/iOS/Program.csproj @@ -49,14 +49,14 @@ + LLVMPath="$(MicrosoftNetCoreAppRuntimePackDir)native\cross\$(PackageRID)"> diff --git a/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj index 9cc1038feec304..8082073239fc50 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj @@ -28,14 +28,14 @@ + LLVMPath="$(MicrosoftNetCoreAppRuntimePackDir)native\cross\$(PackageRID)"> From dc1a0eced51c981aafe7654924390dd6f279456a Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 8 Jan 2021 15:10:12 -0500 Subject: [PATCH 155/185] Cleanup suggestions from Jeremy --- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 10 ---------- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 3 +-- src/mono/monoaotcross.proj | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index 8f3b7fb26090d4..d3323c646556bd 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -11,10 +11,6 @@ monocrossaot linux-x64;osx-x64 false - - AddRuntimeFilesToPackage; - AddFrameworkFilesToPackage - false tools/ true @@ -24,12 +20,6 @@ - - - - - - diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index cc4fcd7c56822b..0f75628cf10fc5 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -1,5 +1,4 @@ - - + android-x64;android-arm64;android-x86;android-arm diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 21260d649d2f00..c573eed579acd3 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,4 +1,4 @@ - + Android-x64;Android-arm64;Android-x86;Android-arm From e157f3f72c5e6b13c1ffa45d046106fd1032f93b Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 8 Jan 2021 15:15:30 -0500 Subject: [PATCH 156/185] More cleanup --- .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index d3323c646556bd..a344c212d2f845 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -1,6 +1,5 @@ - - - + + true @@ -20,11 +19,7 @@ - - - - From cab92f2560925b7dc26411d5168fec9eeac70b86 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 8 Jan 2021 16:10:58 -0500 Subject: [PATCH 157/185] Fix for WASM failure --- src/mono/wasm/build/WasmApp.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets index e8ee9140800f61..d224a9ea2ba0da 100644 --- a/src/mono/wasm/build/WasmApp.targets +++ b/src/mono/wasm/build/WasmApp.targets @@ -41,7 +41,7 @@ Date: Mon, 11 Jan 2021 11:26:22 -0500 Subject: [PATCH 158/185] Add Mono cross to official build --- eng/pipelines/runtime-official.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 0c07ccf7a2f0bd..921923855f3204 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -122,6 +122,35 @@ stages: extraStepsParameters: name: MonoRuntimePacks + # Build Mono AOT offset headers once, for consumption elsewhere + # + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml + buildConfig: release + platforms: + - Android_x64 + jobParameters: + + # + # Build Mono release Android AOT cross-compiler + # + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/mono/templates/build-job.yml + runtimeFlavor: mono + buildConfig: release + platforms: + - OSX_x64 + - Linux_x64 + jobParameters: + runtimeVariant: crossandroid + dependsOn: mono_android_offsets + monoCrossAOTTargetOS: Android + isOfficialBuild: ${{ variables.isOfficialBuild }} + extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml + extraStepsParameters: + name: MonoRuntimePacks # # Build Mono LLVM runtime packs # From 53dd723a277871bed4932b7b6268e3f36333c45e Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 11:28:26 -0500 Subject: [PATCH 159/185] jobParameters cannot be empty --- eng/pipelines/runtime-official.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 921923855f3204..1e9e56a30487c2 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -130,7 +130,6 @@ stages: buildConfig: release platforms: - Android_x64 - jobParameters: # # Build Mono release Android AOT cross-compiler From e92102235cfebaf1152a54a44fe524f9a0d7ebfc Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 12:09:37 -0500 Subject: [PATCH 160/185] Be more aggressive in making offsets build --- eng/pipelines/runtime.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 67e3d54c167f54..7d93f01abf1b85 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -195,7 +195,8 @@ jobs: jobParameters: condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # Build the whole product using Mono runtime From 96b4f5fe5b4385f5a0c711784b66f20738c3b4f9 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 12:17:27 -0500 Subject: [PATCH 161/185] OK, maybe now? --- eng/pipelines/mono/templates/generate-offsets.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index c654eeb3540c76..55c820c73f9ede 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -21,6 +21,9 @@ jobs: condition: ${{ parameters.condition }} dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} + ${{ if eq(parameters.useCheckoutBundle, true) }}: + dependsOn: checkout + # Compute job name from template parameters name: ${{ format('mono_{0}_offsets', parameters.osGroup) }} displayName: ${{ format('Mono {0} AOT offsets', parameters.osGroup) }} From 21d76c9bf7e07360c08293b4b49ae1fbe59f28f9 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 12:59:40 -0500 Subject: [PATCH 162/185] Switch monoaotcross.proj back to Traversal, due to NuGet error --- src/mono/monoaotcross.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index c573eed579acd3..21260d649d2f00 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,4 +1,4 @@ - + Android-x64;Android-arm64;Android-x86;Android-arm From 02cb3d0b4371352d440dc80428c5ffa3dde2f17c Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 13:33:22 -0500 Subject: [PATCH 163/185] Better fix from Viktor --- src/mono/monoaotcross.proj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 21260d649d2f00..d9a7ac2cb4052d 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -1,4 +1,8 @@ - + + + $(NetCoreAppToolCurrent) + + Android-x64;Android-arm64;Android-x86;Android-arm From a751b90867782d31001c0c1eb2b1c9e31a8dfa1e Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 14:56:39 -0500 Subject: [PATCH 164/185] Ensure AOT arg is passed to package build --- eng/pipelines/mono/templates/build-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 36bb5419d60431..2ba30f1ff90fb7 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -158,10 +158,10 @@ jobs: # Build packages - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg) + - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) -pack $(OutputRidArg) displayName: Build nupkg - ${{ if eq(parameters.osGroup, 'windows') }}: - - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg) + - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) -pack $(OutputRidArg) displayName: Build nupkg # Publish official build From ae850a0356ad71c3feba60a2e16b35358c8976b1 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 11 Jan 2021 16:18:13 -0500 Subject: [PATCH 165/185] Did I miss build args? --- eng/pipelines/runtime-official.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 1e9e56a30487c2..37b4138f07d766 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -143,6 +143,7 @@ stages: - OSX_x64 - Linux_x64 jobParameters: + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) runtimeVariant: crossandroid dependsOn: mono_android_offsets monoCrossAOTTargetOS: Android From 8847d5fb096e012947b72637d9d87bbe0cc1cb23 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 09:25:37 -0500 Subject: [PATCH 166/185] fixed? --- eng/pipelines/runtime-official.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 37b4138f07d766..246fb5f0e7fa22 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -136,7 +136,7 @@ stages: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/mono/templates/build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml runtimeFlavor: mono buildConfig: release platforms: From 59d19eadf2f673d10230bc92621d8c41ebb2dcb3 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 10:00:55 -0500 Subject: [PATCH 167/185] Change runtime.yml for new checkout behaviour --- eng/pipelines/runtime.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 7d93f01abf1b85..300fc83a5c9460 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -499,7 +499,8 @@ jobs: monoCrossAOTTargetOS: Android condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # From 30afc60133a9f16cef8664dc8d9089808ae0aaa1 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 10:39:01 -0500 Subject: [PATCH 168/185] Let's not put debug spew into the repo, eh? --- eng/pipelines/mono/templates/build-job.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 2ba30f1ff90fb7..6c31826095e132 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -140,11 +140,6 @@ jobs: df -h displayName: Disk Usage after Build - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - - script: | - find artifacts/bin -type f - displayName: Why are computers like this - # Publish product output directory for consumption by tests. - template: /eng/pipelines/common/upload-artifact-step.yml parameters: From 072859e252be92866db4ac0352513b2f9ba30b58 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 10:50:48 -0500 Subject: [PATCH 169/185] Maybe specifying nameSuffix will allow global-build-job to disambiguate --- eng/pipelines/runtime-official.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 246fb5f0e7fa22..772bf8d0d99c84 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -144,6 +144,7 @@ stages: - Linux_x64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + nameSuffix: AndroidAOT_Mono runtimeVariant: crossandroid dependsOn: mono_android_offsets monoCrossAOTTargetOS: Android From 62334e2137355fcf617f09a8b45c4d30228906aa Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 12 Jan 2021 12:23:17 -0500 Subject: [PATCH 170/185] Liberal sprinkle of ToLower() --- src/mono/monoaotcross.proj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index d9a7ac2cb4052d..b69b65856c8a4e 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -34,12 +34,12 @@ Properties="BuildMonoAOTCrossCompilerOnly=true;SkipMonoCrossJitConfigure=$(SkipMonoCrossJitConfigure);TargetArchitecture=$(MonoAotTargetArchitecture);TargetOS=$(MonoAotTargetOS)" /> - <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid)\**" /> + <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid.ToLower())\**" /> - + - + From 9edf683cf45762436f6dfd381f1ced3587dc028f Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 14:06:18 -0500 Subject: [PATCH 171/185] Missing args --- eng/pipelines/runtime-official.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 772bf8d0d99c84..1b08cf4c002730 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -144,6 +144,7 @@ stages: - Linux_x64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: AndroidAOT_Mono runtimeVariant: crossandroid dependsOn: mono_android_offsets From 15cf3c0e7a9c16b0418ec2939c3c3012cf7ac9f7 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 16:31:16 -0500 Subject: [PATCH 172/185] Add dependsOn to global-build-job --- eng/pipelines/common/global-build-job.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index c197d33b16500f..e04fe421e689b8 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -11,6 +11,7 @@ parameters: variables: [] targetRid: '' timeoutInMinutes: '' + dependsOn: '' pool: '' platform: '' condition: true @@ -36,12 +37,15 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} enablePublishTestResults: ${{ parameters.enablePublishTestResults }} testResultsFormat: ${{ parameters.testResultsFormat }} + dependsOn: ${{ parameters.dependsOn }} workspace: clean: all ${{ if eq(parameters.useCheckoutBundle, true) }}: - dependsOn: checkout + dependsOn: + - checkout + - ${{ parameters.dependsOn }} variables: - name: _osParameter From 22bfc7f9c654e885db73acd7df25dab710ad0166 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 17:07:08 -0500 Subject: [PATCH 173/185] Revert "Add dependsOn to global-build-job" This reverts commit 15cf3c0e7a9c16b0418ec2939c3c3012cf7ac9f7. --- eng/pipelines/common/global-build-job.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index e04fe421e689b8..c197d33b16500f 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -11,7 +11,6 @@ parameters: variables: [] targetRid: '' timeoutInMinutes: '' - dependsOn: '' pool: '' platform: '' condition: true @@ -37,15 +36,12 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} enablePublishTestResults: ${{ parameters.enablePublishTestResults }} testResultsFormat: ${{ parameters.testResultsFormat }} - dependsOn: ${{ parameters.dependsOn }} workspace: clean: all ${{ if eq(parameters.useCheckoutBundle, true) }}: - dependsOn: - - checkout - - ${{ parameters.dependsOn }} + dependsOn: checkout variables: - name: _osParameter From 0587cba933a4268f4de8f6f089a13bd9a2ef5430 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 12 Jan 2021 17:10:20 -0500 Subject: [PATCH 174/185] Use build-job directly, going via global-build-job is too hard --- eng/pipelines/runtime-official.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 1b08cf4c002730..ba0c77b321fc4d 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -136,16 +136,13 @@ stages: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml + jobTemplate: /eng/pipelines/mono/templates/build-job.yml runtimeFlavor: mono buildConfig: release platforms: - OSX_x64 - Linux_x64 jobParameters: - buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) - /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true - nameSuffix: AndroidAOT_Mono runtimeVariant: crossandroid dependsOn: mono_android_offsets monoCrossAOTTargetOS: Android @@ -153,6 +150,7 @@ stages: extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: name: MonoRuntimePacks + # # Build Mono LLVM runtime packs # From 014feb7e8c59d187b4b5bb53c8764d83324095d2 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 10:43:40 -0500 Subject: [PATCH 175/185] Revert "Use build-job directly, going via global-build-job is too hard" This reverts commit 0587cba933a4268f4de8f6f089a13bd9a2ef5430. --- eng/pipelines/runtime-official.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index ba0c77b321fc4d..1b08cf4c002730 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -136,13 +136,16 @@ stages: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/mono/templates/build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml runtimeFlavor: mono buildConfig: release platforms: - OSX_x64 - Linux_x64 jobParameters: + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + /p:BuildMonoCrossAOT=true /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + nameSuffix: AndroidAOT_Mono runtimeVariant: crossandroid dependsOn: mono_android_offsets monoCrossAOTTargetOS: Android @@ -150,7 +153,6 @@ stages: extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: name: MonoRuntimePacks - # # Build Mono LLVM runtime packs # From e7e52c14cc0f674f279cfcd976479df8ae44c499 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 10:45:24 -0500 Subject: [PATCH 176/185] Move artifact download to global-job, because reasons --- eng/pipelines/common/global-build-job.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index c197d33b16500f..670303f19f3e30 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -82,6 +82,13 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml + - ${{ if eq(parameters.monoCrossAOTTargetOS, 'Android') }}: + - task: DownloadPipelineArtifact@2 + displayName: Download AOT offset files + inputs: + artifact: Mono_Offsets_Android + path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies From d9276e8efaf46a2bb6db60fe1fb618328c60a405 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 11:03:32 -0500 Subject: [PATCH 177/185] Pass through dependsOn in global-build-job --- eng/pipelines/common/global-build-job.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 670303f19f3e30..a7947e784bc4a9 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -11,6 +11,7 @@ parameters: variables: [] targetRid: '' timeoutInMinutes: '' + dependsOn: '' pool: '' platform: '' condition: true @@ -40,8 +41,12 @@ jobs: workspace: clean: all + dependsOn: ${{ parameters.dependsOn }} + ${{ if eq(parameters.useCheckoutBundle, true) }}: - dependsOn: checkout + dependsOn: + - checkout + - ${{ parameters.dependsOn }} variables: - name: _osParameter From 97b15bb861501e89e4b2116a9aa93a8d7f940f67 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 12:46:18 -0500 Subject: [PATCH 178/185] Changes from Zoltan --- src/mono/netcore/sample/Android/Makefile | 4 ++-- src/mono/netcore/sample/iOS/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/netcore/sample/Android/Makefile b/src/mono/netcore/sample/Android/Makefile index 95cd37aa7cb32d..ff6372067eee1e 100644 --- a/src/mono/netcore/sample/Android/Makefile +++ b/src/mono/netcore/sample/Android/Makefile @@ -2,7 +2,7 @@ MONO_CONFIG=Release MONO_ARCH=x64 DOTNET := ../../../../.././dotnet.sh USE_LLVM=true -FORCE_AOT=false +AOT=false all: runtimepack run @@ -15,7 +15,7 @@ run: /p:TargetOS=Android \ /p:Configuration=$(MONO_CONFIG) \ /p:DeployAndRun=true \ - /p:ForceAOT=$(FORCE_AOT) \ + /p:ForceAOT=$(AOT) \ /p:UseLLVM=$(USE_LLVM) \ /p:RunActivity=false diff --git a/src/mono/netcore/sample/iOS/Makefile b/src/mono/netcore/sample/iOS/Makefile index ff280e3411c7be..c5888ce8dacd67 100644 --- a/src/mono/netcore/sample/iOS/Makefile +++ b/src/mono/netcore/sample/iOS/Makefile @@ -2,7 +2,7 @@ MONO_CONFIG=Debug MONO_ARCH=x64 DOTNET := ../../../../.././dotnet.sh USE_LLVM=true -FORCE_AOT=false +AOT=false all: runtimepack run @@ -16,7 +16,7 @@ runtimepack: run: clean appbuilder $(DOTNET) publish -c $(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=$(USE_LLVM) /p:ForceAOT=$(FORCE_AOT) + /p:UseLLVM=$(USE_LLVM) /p:ForceAOT=$(AOT) clean: rm -rf bin From fa0ca3354adaee28753c9414ae11f3fe8991bcd3 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 12:48:33 -0500 Subject: [PATCH 179/185] Changes from Zoltan --- eng/pipelines/common/global-build-job.yml | 2 +- eng/pipelines/mono/templates/build-job.yml | 2 +- eng/pipelines/mono/templates/generate-offsets.yml | 4 ++-- src/mono/mono.proj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index a7947e784bc4a9..7aa1170914d59a 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -92,7 +92,7 @@ jobs: displayName: Download AOT offset files inputs: artifact: Mono_Offsets_Android - path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' + path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 6c31826095e132..186a6dfd88ca54 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -118,7 +118,7 @@ jobs: displayName: Download AOT offset files inputs: artifact: Mono_Offsets_Android - path: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' + path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: - script: | diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 55c820c73f9ede..8a9d7a52b18792 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -77,12 +77,12 @@ jobs: inputs: sourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/mono/' contents: '**/offsets-*.h' - targetFolder: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles/' + targetFolder: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles/' - task: PublishPipelineArtifact@1 displayName: Upload offset files inputs: - targetPath: '$(Build.SourcesDirectory)/artifacts/obj/monooffsetfiles' + targetPath: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' artifactName: 'Mono_Offsets_$(osGroup)' # Publish Logs diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 41f5371a8c16b3..608070fa3f42b7 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -441,7 +441,7 @@ <_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration) <_MonoAotCMakeBuildCommand Condition="'$(MonoVerboseBuild)' == 'true'">$(_MonoAotCMakeBuildCommand) --verbose <_MonoAotCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoAotCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount) - <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\monooffsetfiles\$(PlatformConfigPathPart)\cross\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)')) + <_MonoAotPrebuiltOffsetsFile>$(ArtifactsObjDir)\mono\offsetfiles\$(PlatformConfigPathPart)\cross\$([System.IO.Path]::GetFileName('$(MonoAotOffsetsFile)')) From 098090e1bf40c62ae19a9e49575355bfb3536b59 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 12:55:39 -0500 Subject: [PATCH 180/185] changes from santi --- eng/pipelines/mono/templates/build-job.yml | 1 - eng/pipelines/mono/templates/generate-offsets.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 186a6dfd88ca54..2d91e4b26ebac8 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -13,7 +13,6 @@ parameters: isOfficialBuild: false crossBuild: false crossrootfsDir: '' - dependOnEvaluatePaths: false dependsOn: '' monoCrossAOTTargetOS: '' useCheckoutBundle: false diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 8a9d7a52b18792..d271e3d3b1c3fc 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -19,7 +19,6 @@ jobs: enableMicrobuild: true pool: ${{ parameters.pool }} condition: ${{ parameters.condition }} - dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} ${{ if eq(parameters.useCheckoutBundle, true) }}: dependsOn: checkout From 4da4b41d9a528a3f855e325da177d463f9dffecd Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 13:51:09 -0500 Subject: [PATCH 181/185] Don't redefine --- eng/pipelines/common/global-build-job.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 7aa1170914d59a..36bdbf12b2c36c 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -41,7 +41,8 @@ jobs: workspace: clean: all - dependsOn: ${{ parameters.dependsOn }} + ${{ if ne(parameters.useCheckoutBundle, true) }}: + dependsOn: ${{ parameters.dependsOn }} ${{ if eq(parameters.useCheckoutBundle, true) }}: dependsOn: From b0ce4169ea7b9c1e3ff270e53d3596b62c803c61 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 13:55:48 -0500 Subject: [PATCH 182/185] Better dependsOn --- eng/pipelines/common/global-build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 36bdbf12b2c36c..be244bd3ec3588 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -41,7 +41,7 @@ jobs: workspace: clean: all - ${{ if ne(parameters.useCheckoutBundle, true) }}: + ${{ if and(ne(parameters.useCheckoutBundle, true),eq(parameters.dependsOn,'') }}: dependsOn: ${{ parameters.dependsOn }} ${{ if eq(parameters.useCheckoutBundle, true) }}: From e719d365c5d144a2727eb6b11c7836a297257216 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 13:58:05 -0500 Subject: [PATCH 183/185] Typo --- eng/pipelines/common/global-build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index be244bd3ec3588..56747700dc6a91 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -41,7 +41,7 @@ jobs: workspace: clean: all - ${{ if and(ne(parameters.useCheckoutBundle, true),eq(parameters.dependsOn,'') }}: + ${{ if and(ne(parameters.useCheckoutBundle, true),ne(parameters.dependsOn,'')) }}: dependsOn: ${{ parameters.dependsOn }} ${{ if eq(parameters.useCheckoutBundle, true) }}: From af351ac99792e3fda88355e42050396754710898 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 13 Jan 2021 14:00:19 -0500 Subject: [PATCH 184/185] More mess --- eng/pipelines/common/global-build-job.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 56747700dc6a91..ba0775f9c22c70 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -47,7 +47,8 @@ jobs: ${{ if eq(parameters.useCheckoutBundle, true) }}: dependsOn: - checkout - - ${{ parameters.dependsOn }} + - ${{ if ne(parameters.dependsOn,'') }}: + - ${{ parameters.dependsOn }} variables: - name: _osParameter From 7b01293f1f717f614b1e8df2a31a5236a43c78b3 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 14 Jan 2021 10:06:25 -0500 Subject: [PATCH 185/185] Changes from Viktor --- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 10 +++------- src/mono/monoaotcross.proj | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index 0f75628cf10fc5..97ff1a1de517a5 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -1,4 +1,4 @@ - + android-x64;android-arm64;android-x86;android-arm @@ -6,14 +6,10 @@ + - - - - - + + $(NetCoreAppToolCurrent) @@ -12,7 +12,7 @@ - +