diff --git a/Directory.Build.props b/Directory.Build.props index 799d054f3b1af5..91557e1435793d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -57,7 +57,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppCurrent)', 'publish')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)')) - + $([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll')) $([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll')) $([MSBuild]::NormalizePath('$(WasmAppBuilderDir)', 'WasmAppBuilder.dll')) @@ -105,8 +105,6 @@ - - true false diff --git a/eng/Configurations.props b/eng/Configurations.props index d26beec0e3e683..c4bd905ddc6278 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -4,6 +4,11 @@ steps and in the repository. --> + + + true + + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr')) @@ -49,9 +54,6 @@ - $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) - win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) - OSX FreeBSD NetBSD @@ -68,6 +70,108 @@ true + + <_runtimeOS>$(RuntimeOS) + + <_parseDistroRid>$(__DistroRid) + <_parseDistroRid Condition="'$(_parseDistroRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) + <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-")) + + <_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex))) + + + <_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant()) + + <_runtimeOSVersionIndex>$(_runtimeOS.IndexOfAny(".-0123456789")) + <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(_runtimeOS.SubString(0, $(_runtimeOSVersionIndex))) + + <_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX')) + <_portableOS>linux + <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl + <_portableOS Condition="$(_buildingInOSX)">osx + <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(TargetOS)' == 'windows'">win + <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd + <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos + <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris + <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser + <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios + <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos + <_portableOS Condition="'$(_runtimeOS)' == 'android'">android + + <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux + <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS) + + + <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux + + + + <_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + arm + arm64 + wasm + x64 + x64 + + + + <_toolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64 + <_toolRuntimeRID Condition="'$(_toolRuntimeRID)' == ''">$(_runtimeOS)-$(_hostArch) + + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' and $(TargetArchitecture.StartsWith('arm')) and !$(_hostArch.StartsWith('arm'))">linux-x64 + + + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' == 'windows'">win-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' != 'windows' and $(_buildingInOSX)">osx-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' != 'windows' and !$(_buildingInOSX)">linux-x64 + + + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' == 'windows'">win-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' != 'windows' and $(_buildingInOSX)">osx-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' != 'windows' and !$(_buildingInOSX)">linux-x64 + + + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64 + $(_toolRuntimeRID) + + <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture) + $(_packageRID) + $(_runtimeOS)-$(TargetArchitecture) + + <_outputRID Condition="'$(TargetOS)' == 'windows'">win-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'OSX'">osx-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'Linux'">linux-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture) + + $(PackageRID) + $(_outputRID) + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + true @@ -76,4 +180,6 @@ false + + diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh index f5d14f2f7cd50b..bddfb85f18d537 100644 --- a/eng/native/init-distro-rid.sh +++ b/eng/native/init-distro-rid.sh @@ -119,7 +119,6 @@ initNonPortableDistroRid() # # __DistroRid # __PortableBuild -# __RuntimeId # initDistroRidGlobal() { @@ -194,13 +193,8 @@ initDistroRidGlobal() if [ -z "$__DistroRid" ]; then echo "DistroRid is not set. This is almost certainly an error" - exit 1 - else - echo "__DistroRid: ${__DistroRid}" - echo "__RuntimeId: ${__DistroRid}" - - __RuntimeId="${__DistroRid}" - export __RuntimeId fi + + echo "__DistroRid: ${__DistroRid}" } diff --git a/eng/native/naming.props b/eng/native/naming.props index dbc7bc7cd9f886..7a02d6c6c68152 100644 --- a/eng/native/naming.props +++ b/eng/native/naming.props @@ -1,45 +1,54 @@ + + lib + + - + - .exe - - .dll - .lib - .pdb + .exe + .dll + .lib + .pdb - + - lib - .dylib - .a - .dwarf + lib + .dylib + .a + .dwarf - + - lib - .so - .a + lib + .so + .a - .debug + .debug - lib - .so - .a - .dbg + lib + .so + .a + .dbg - - + + + + + $(SymbolsSuffix) + + diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props index fbaf583697f89c..08e71350e9824c 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -50,22 +50,6 @@ $(PackageVersion) - - - true - true - true - true - true - true - true - - true - - - $(__DistroRid) - - Portable diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 3473cbf83b521b..1e0b60ec47c4bb 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -20,36 +20,14 @@ true - - <_parseDistroRid>$(__DistroRid) - <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetOS)' == 'OSX'">osx.10.12-x64 - <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-")) - <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1)) - $(_parseDistroRid.SubString(0, $(_distroRidIndex))) - win10 - - $(_parseDistroRid.SubString($(_archRidIndex))) - $(Platform) - - $(OSRid) - windows;OSX;Android;Linux;FreeBSD;NetBSD;illumos;Solaris ;$(SupportedPackageOSGroups); - - <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789")) - <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex))) - <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' == '-1'">$(RuntimeOS) <_isSupportedOSGroup>true - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">windows <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS) <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux @@ -73,92 +51,6 @@ true - - - - - - $(OutputRID) - - - - - - win-$(TargetArchitecture) - - - - - osx.10.12-$(TargetArchitecture) - - osx-$(TargetArchitecture) - - - - - freebsd.11-$(TargetArchitecture) - - freebsd-$(TargetArchitecture) - - - - - netbsd-$(TargetArchitecture) - - netbsd-$(TargetArchitecture) - - - - - illumos-$(TargetArchitecture) - - illumos-$(TargetArchitecture) - - - - - solaris-$(TargetArchitecture) - - solaris-$(TargetArchitecture) - - - - - android.21-$(TargetArchitecture) - - android-$(TargetArchitecture) - - - - - $(OSRid)-$(TargetArchitecture) - - linux-$(TargetArchitecture) - - - - - $(OSRid)-$(TargetArchitecture) - - linux-musl-$(TargetArchitecture) - - - - - $(RuntimeOS)-$(TargetArchitecture) - - - - - $(RuntimeOS)-$(TargetArchitecture) - - linux-$(TargetArchitecture) - - - - - - diff --git a/src/coreclr/src/.nuget/Directory.Build.targets b/src/coreclr/src/.nuget/Directory.Build.targets index f9886d59b0bbdc..eeab2931cf8376 100644 --- a/src/coreclr/src/.nuget/Directory.Build.targets +++ b/src/coreclr/src/.nuget/Directory.Build.targets @@ -9,8 +9,8 @@ Finds symbol files and injects them into the package build. --> - - + + @@ -42,7 +42,7 @@ - + diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index ff68beebb047fa..744c17ad28bb6b 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -8,7 +8,7 @@ - + diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 116da5fd20dd27..8c6321fc7fd8c6 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -8,7 +8,7 @@ - + diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index aad674a2504000..81b519f74bce8e 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -8,7 +8,7 @@ - + diff --git a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj index b4844002483e6b..e6822043a1ec9e 100644 --- a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj @@ -63,13 +63,7 @@ $(TargetOSComponent)_$(TargetArchitecture)_$(TargetArchitecture) $(TargetOSComponent)_$(TargetArchitecture)_$(CrossHostArch) - lib - - .dll - .so - .dylib - - $(LibraryNamePrefix)jitinterface_$(TargetArchitecture)$(LibraryNameExtension) + $(LibPrefix)jitinterface_$(TargetArchitecture)$(LibSuffix) @@ -79,7 +73,7 @@ Link="%(FileName)%(Extension)" /> - - @@ -104,8 +98,8 @@ - + Exclude="$(RuntimeBinDir)\crossgen2\$(JitInterfaceLibraryName);$(RuntimeBinDir)\crossgen2\$(LibPrefix)clrjit_*$(LibSuffix)" /> + @@ -117,14 +111,14 @@ diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 28dc7f98be61f2..15472af36dcb95 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -57,29 +57,6 @@ $(DefineConstants),TRACE - - .exe - - - - $(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture) - - - - - win-$(TargetArchitecture) - osx-$(TargetArchitecture) - linux-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - netbsd-$(TargetArchitecture) - illumos-$(TargetArchitecture) - solaris-$(TargetArchitecture) - ios-$(TargetArchitecture) - tvos-$(TargetArchitecture) - android-$(TargetArchitecture) - browser-$(TargetArchitecture) - - $(OutputRid) @@ -135,187 +112,6 @@ $(SharedHostInstallerStart)$(InstallerStartSuffix)- $(HostFxrInstallerStart)$(InstallerStartSuffix)- $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- - - - - - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - false - - - - - true - - - - - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - true - - - - - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - true - - true - - - - - - .zip - .tar.gz - .msi - .pkg - .deb - .rpm - .exe - $(InstallerExtension) - - - - - $(OutputRid) - osx.10.10-x64 - rhel.7-x64 @@ -325,22 +121,4 @@ --> true - - - lib - .so - .dll - .dylib - lib - .a - .lib - - - - .map - .ni.pdb - - - - diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets index 7a859d808b2295..dc2e7c7eed40c4 100644 --- a/src/installer/Directory.Build.targets +++ b/src/installer/Directory.Build.targets @@ -89,11 +89,6 @@ Runtime/$(SharedFrameworkNugetVersion)/ - - $(SharedFrameworkNugetVersion)-$(PackageTargetRid) - $(HostResolverVersion)-$(PackageTargetRid) - - $(HostVersion) 1 @@ -142,60 +137,6 @@ - - - $(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension) - $(CombinedInstallerStart)$(ProductMoniker)-engine.exe - - $(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension) - $(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension) - $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) - $(DotnetRuntimeDependenciesPackageInstallerStart)$(ProductMoniker)$(InstallerExtension) - - dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension) - dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension) - dotnet-nethost-$(AppHostVersion)-$(PackageTargetRid)$(CompressedFileExtension) - dotnet-crossgen2-$(ProductMoniker)$(CompressedFileExtension) - dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension) - dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension) - - $(DotnetHostFxrString)$(ProductBandVersion) - $(HostFxrDebPkgName.ToLower()) - $(DotnetRuntimeString)$(ProductBandVersion) - $(SharedFxDebPkgName.ToLower()) - $(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion) - $(RuntimeDependenciesDebPkgName.ToLower()) - - dotnet-hostfxr-$(ProductBandVersion) - $(HostFxrRpmPkgName.ToLower()) - dotnet-runtime-$(ProductBandVersion) - $(SharedFxRpmPkgName.ToLower()) - $(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion) - $(RuntimeDependenciesRpmPkgName.ToLower()) - - - - $(AssetOutputPath)dotnet-targeting-pack-$(ProductMoniker)$(InstallerExtension) - $(AssetOutputPath)dotnet-apphost-pack-$(ProductMoniker)$(InstallerExtension) - 2.1 - $(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)-$(PackageTargetRid) - $(AssetOutputPath)netstandard-targeting-pack-$(NetStandardProductMoniker)$(InstallerExtension) - - - - - $(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) - $(HostFxrInstallerStart)$(HostResolverVersion)-$(TargetArchitecture)$(InstallerExtension) - $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) - - - - - $(DotnetRuntimeDependenciesPackageInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) - - - diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props index b9ad8328b4d290..b3d84b7fe22863 100644 --- a/src/installer/pkg/projects/Directory.Build.props +++ b/src/installer/pkg/projects/Directory.Build.props @@ -157,6 +157,4 @@ - - diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index e29724f0f85eaf..095938d03a4f84 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -133,8 +133,8 @@ Finds symbol files and injects them into the package build. --> - - + + @@ -162,7 +162,7 @@ - + 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 index 0ce0a5fcb2c356..eeedb0faea012a 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj @@ -4,10 +4,10 @@ - - - - + + + + @@ -29,4 +29,4 @@ true - \ No newline at end of file + 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 000ba4fe483997..a957392ccde459 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 @@ -7,7 +7,7 @@ - + runtimes/$(PackageTargetRuntime)/native true 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 06f4c389123734..43d12c53b96dc9 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,7 +9,7 @@ - + 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 5a49dbb69b2260..a2d33da0e18b28 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 @@ -11,7 +11,7 @@ - + runtimes/$(PackageTargetRuntime)/native true diff --git a/src/installer/pkg/sfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props index a078c899d81592..6c4517eb7b5bf3 100644 --- a/src/installer/pkg/sfx/Directory.Build.props +++ b/src/installer/pkg/sfx/Directory.Build.props @@ -20,6 +20,4 @@ true true - - 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 ed0ed5da583dbe..89490af741fa25 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 @@ -21,7 +21,7 @@ tools/ true - + unix win @@ -33,17 +33,17 @@ - - - - - - - - + + + + + + + + - - + + @@ -75,10 +75,10 @@ - <_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)'" /> + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibPrefix)clrjit' and '%(Extension)' == '$(LibSuffix)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibPrefix)clrjit' and '%(Extension)' == '$(LibSuffix)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ExeSuffix)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ExeSuffix)'" /> - - - - + + + + @@ -40,7 +40,7 @@ IsSymbolFile="true" IsNative="true" /> <_SymbolFiles Condition="'$(TargetOS)' != 'windows'" - Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolFileExtension)')" + Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolsSuffix)')" IsSymbolFile="true" IsNative="true" /> 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 75ef79bc758012..2402d7fbe2ef63 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 @@ -44,8 +44,8 @@ - - + + @@ -108,10 +108,10 @@ - <_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)'" /> + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibPrefix)clrjit' and '%(Extension)' == '$(LibSuffix)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibPrefix)clrjit' and '%(Extension)' == '$(LibSuffix)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ExeSuffix)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ExeSuffix)'" /> - + - diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index 6e2bc2f03f3d6c..7691ad32cee765 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -106,7 +106,7 @@ - $(HostRuntimeIdentifier) + $(PackageRID) $(MSBuildProjectName) $(ArtifactsDir)tests/$(Configuration)/ diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 076d8145cc2b75..9d600a0efd9514 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -1,6 +1,7 @@ true + true @@ -19,24 +20,9 @@ $(RepositoryEngineeringDir)LicenseHeader.txt - - $(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-')))) - - - $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - arm - arm64 - wasm - x64 - x64 - - - $(TargetOS.ToLowerInvariant()) - Debug $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '(-[^;]+)', '')) @@ -93,57 +79,6 @@ - - <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789")) - <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex))) - <_portableOS>linux - <_portableOS Condition="'$(RuntimeOS)' == 'linux-musl'">linux-musl - <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(TargetOS)' == 'windows'">win - <_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx - <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd - <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos - <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris - <_portableOS Condition="'$(RuntimeOS)' == 'Browser'">browser - <_portableOS Condition="'$(RuntimeOS)' == 'ios'">ios - <_portableOS Condition="'$(RuntimeOS)' == 'tvos'">tvos - <_portableOS Condition="'$(RuntimeOS)' == 'android'">android - - <_runtimeOS>$(RuntimeOS) - <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.4.0.0'">linux - <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.5.0.0'">linux - <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS) - $(_runtimeOS)-x64 - $(_runtimeOS)-$(HostArch) - - linux-x64 - - - <_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX')) - win-x64 - osx-x64 - linux-x64 - - - win-x64 - osx-x64 - linux-x64 - - - osx-x64 - $(ToolRuntimeRID) - - - <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux - - - <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux - - <_packageRID /> - <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture) - $(_packageRID) - $(RuntimeOS)-$(TargetArchitecture) - - true diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 20eb5e92624ef2..1fece622cdb550 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -30,7 +30,7 @@ true - false + false - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - 8.0 diff --git a/src/tests/Common/ilasm/ilasm.ilproj b/src/tests/Common/ilasm/ilasm.ilproj index 415d2ec53eaec8..35c0b4ee0c5195 100644 --- a/src/tests/Common/ilasm/ilasm.ilproj +++ b/src/tests/Common/ilasm/ilasm.ilproj @@ -4,6 +4,6 @@ needed by the IL SDK. --> - $(TargetRid) + $(PackageRID) diff --git a/src/tests/Common/publishdependency.targets b/src/tests/Common/publishdependency.targets index 35ed438bc9962c..596e4573756df1 100644 --- a/src/tests/Common/publishdependency.targets +++ b/src/tests/Common/publishdependency.targets @@ -28,7 +28,7 @@ + Properties="Language=C#;RuntimeIdentifier=$(PackageRID)" /> diff --git a/src/tests/Common/test_dependencies/test_dependencies.csproj b/src/tests/Common/test_dependencies/test_dependencies.csproj index 106e50602676ac..86c965ad15cba4 100644 --- a/src/tests/Common/test_dependencies/test_dependencies.csproj +++ b/src/tests/Common/test_dependencies/test_dependencies.csproj @@ -5,7 +5,7 @@ $(NetCoreAppToolCurrent) true true - win-arm;win-arm64;win-x64;win-x86;$(TargetRid) + win-arm;win-arm64;win-x64;win-x86;$(PackageRID) true Release diff --git a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj index ab7b191f39c39b..6a544c39f98376 100644 --- a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj +++ b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj @@ -5,7 +5,7 @@ $(NetCoreAppToolCurrent) true true - win-arm;win-arm64;win-x64;win-x86;$(TargetRid) + win-arm;win-arm64;win-x64;win-x86;$(PackageRID) true Release diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 7b834896308bcd..c0d820eb7de806 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -106,65 +106,6 @@ false - - - - - - - - - - true - win-$(TargetArchitecture) - - - - - true - true - ubuntu.14.04-$(TargetArchitecture) - - - - - true - true - osx.10.12-$(TargetArchitecture) - - - - - true - true - ubuntu.14.04-$(TargetArchitecture) - - - - - true - true - ubuntu.14.04-$(TargetArchitecture) - - - - - true - true - ubuntu.14.04-$(TargetArchitecture) - - - - - true - true - ubuntu.14.04-$(TargetArchitecture) - - - - 32 @@ -172,21 +113,6 @@ 64 - - $(__RuntimeId) - $(TestNugetRuntimeId) - - - - - $(TargetRid) - $(TargetRid) - - true C# diff --git a/src/tests/build.cmd b/src/tests/build.cmd index 1003f48063404a..3dca37ac6543b3 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -52,7 +52,6 @@ set __SkipManaged= set __SkipTestWrappers= set __BuildTestWrappersOnly= set __SkipNative= -set __RuntimeId= set __TargetsWindows=1 set __DoCrossgen= set __DoCrossgen2= @@ -109,7 +108,6 @@ if /i "%1" == "buildagainstpackages" (echo error: Remove /BuildAgainstPackages if /i "%1" == "crossgen" (set __DoCrossgen=1&set __TestBuildMode=crossgen&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "crossgen2" (set __DoCrossgen2=1&set __TestBuildMode=crossgen2&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "composite" (set __CompositeBuildMode=1&set __DoCrossgen2=1&set __TestBuildMode=crossgen2&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "runtimeid" (set __RuntimeId=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if /i "%1" == "targetsNonWindows" (set __TargetsWindows=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if /i "%1" == "-priority" (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop) @@ -426,11 +424,6 @@ REM ============================================================================ echo %__MsgPrefix%Creating test overlay -set RuntimeIdArg= -if defined __RuntimeId ( - set RuntimeIdArg=/p:RuntimeId="%__RuntimeId%" -) - set __BuildLogRootName=Tests_Overlay_Managed set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__TargetOS%__%__BuildArch%__%__BuildType%.log set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__TargetOS%__%__BuildArch%__%__BuildType%.wrn @@ -445,7 +438,7 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__SkipFXRestoreArg%^ - !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__BuildNeedTargetArg% %__UnprocessedBuildArgs% + !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__BuildNeedTargetArg% %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Create Test Overlay failed. Refer to the build log files for details: echo %__BuildLog% @@ -560,20 +553,6 @@ echo Build type: one of Debug, Checked, Release ^(default: Debug^). echo skipmanaged: skip the managed tests build echo skipnative: skip the native tests build echo skiprestorepackages: skip package restore -echo runtimeid ^: Builds a test overlay for the specified OS ^(Only supported when building against packages^). Supported IDs are: -echo alpine.3.4.3-x64: Builds overlay for Alpine 3.4.3 -echo debian.8-x64: Builds overlay for Debian 8 -echo fedora.24-x64: Builds overlay for Fedora 24 -echo linux-x64: Builds overlay for portable linux -echo opensuse.42.1-x64: Builds overlay for OpenSUSE 42.1 -echo osx.10.12-x64: Builds overlay for OSX 10.12 -echo osx-x64: Builds overlay for portable OSX -echo rhel.7-x64: Builds overlay for RHEL 7 or CentOS -echo ubuntu.14.04-x64: Builds overlay for Ubuntu 14.04 -echo ubuntu.16.04-x64: Builds overlay for Ubuntu 16.04 -echo ubuntu.16.10-x64: Builds overlay for Ubuntu 16.10 -echo win-x64: Builds overlay for portable Windows -echo win7-x64: Builds overlay for Windows 7 echo crossgen: Precompiles the framework managed assemblies echo copynativeonly: Only copy the native test binaries to the managed output. Do not build the native or managed tests. echo skipgeneratelayout: Do not generate the Core_Root layout diff --git a/src/tests/run.proj b/src/tests/run.proj index 15e44d1a6f68aa..1841c69bc5e63c 100644 --- a/src/tests/run.proj +++ b/src/tests/run.proj @@ -445,22 +445,22 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - - - - - + + Properties="Language=C#;PackageRID=$(PackageRID);RuntimeIdentifier=$(PackageRID)" />