diff --git a/Directory.Build.props b/Directory.Build.props index c3809e2ce32997..cbf29a7eaecf25 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -52,6 +52,14 @@ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) + + + $(RuntimeConfiguration) + $(RuntimeConfiguration) + + Debug + + all @@ -102,12 +102,26 @@ + + + $(RuntimeConfiguration) + $(RuntimeConfiguration) + + Debug + + Configuration=$(CoreCLRConfiguration) + + + Configuration=$(MonoConfiguration) + + + Configuration=$(LibrariesConfiguration) diff --git a/eng/build.ps1 b/eng/build.ps1 index 32c300c6cb44d8..3c3f6e747302a1 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -14,7 +14,7 @@ Param( [string]$arch, [string]$subsetCategory, [string]$subset, - [string]$coreClrConfiguration, + [string]$runtimeConfiguration, [string]$librariesConfiguration, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -132,17 +132,18 @@ foreach ($argument in $PSBoundParameters.Keys) { switch($argument) { - "build" { $arguments += " -build" } - "buildtests" { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } } - "test" { $arguments += " -test" } - "configuration" { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" } + "build" { $arguments += " -build" } + "buildtests" { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } } + "test" { $arguments += " -test" } + "configuration" { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" } + "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" } # This should be removed after we have finalized our ci build pipeline. - "framework" { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}} - "os" { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" } - "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" } - "arch" { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" } - "properties" { $arguments += " " + $properties } - default { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" } + "framework" { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}} + "os" { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" } + "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" } + "arch" { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" } + "properties" { $arguments += " " + $properties } + default { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" } } } diff --git a/eng/build.sh b/eng/build.sh index 5ef5560b70a0cb..337c2ef460faee 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -125,8 +125,9 @@ while [[ $# > 0 ]]; do arguments="$arguments /p:BuildNativeStripSymbols=true" shift 1 ;; - -coreclrconfiguration) - arguments="$arguments /p:CoreCLRConfiguration=$2" + -runtimeconfiguration) + val="$(tr '[:lower:]' '[:upper:]' <<< ${2:0:1})${2:1}" + arguments="$arguments /p:RuntimeConfiguration=$val" shift 2 ;; -librariesconfiguration) diff --git a/eng/docker/build-docker-sdk.ps1 b/eng/docker/build-docker-sdk.ps1 index 546545d637976f..76c1ce7b414070 100755 --- a/eng/docker/build-docker-sdk.ps1 +++ b/eng/docker/build-docker-sdk.ps1 @@ -19,7 +19,7 @@ if ($buildWindowsContainers) # Build on the host machine, then simply copy artifacts to the target docker image. # This should result in significantly lower build times, for now. & "$REPO_ROOT_DIR/coreclr.cmd" -c Release - & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration /p:CoreCLRConfiguration=Release + & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration -runtimeConfiguration release # Dockerize the build artifacts docker build --tag $imageName ` diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 6ac7c85359a213..efba4fb7c309d4 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -9,7 +9,7 @@ COPY . . ARG CONFIGURATION=Release RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \ - ./libraries.sh -c $CONFIGURATION /p:CoreCLRConfiguration=Release + ./libraries.sh -c $CONFIGURATION -runtimeconfiguration release FROM $SDK_BASE_IMAGE as target diff --git a/eng/install-native-dependencies.sh b/eng/install-native-dependencies.sh index aca0e6155f8164..71848222774caf 100644 --- a/eng/install-native-dependencies.sh +++ b/eng/install-native-dependencies.sh @@ -5,7 +5,7 @@ if [ "$1" = "Linux" ]; then if [ "$?" != "0" ]; then exit 1; fi - sudo apt install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev libkrb5-dev libnuma-dev + sudo apt install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev libkrb5-dev libnuma-dev autoconf automake libtool build-essential if [ "$?" != "0" ]; then exit 1; fi @@ -14,7 +14,7 @@ elif [ "$1" = "OSX" ]; then if [ "$?" != "0" ]; then exit 1; fi - brew install icu4c openssl + brew install icu4c openssl autoconf automake libtool pkg-config python3 if [ "$?" != "0" ]; then exit 1; fi diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index f754c165b03063..a63c17866df12d 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -17,6 +17,10 @@ $([MSBuild]::NormalizeDirectory('$(MonoOverridePath)')) $([MSBuild]::NormalizeDirectory('$(LibrariesOverridePath)')) $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigurationsOverridePath)')) + + + $(RuntimeArtifactsPath) + $(RuntimeArtifactsPath) + $(RunWorkingDirectory)$(MonoRspFileName) @@ -76,17 +77,19 @@ + - - - - + <_rspFile Include="$(TestRspFile)" Condition="'$(TestRspFile)' != ''" /> + <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues.rsp" /> + <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_mac.rsp" Condition="'$(TargetOS)' == 'OSX'" /> + <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_linux.rsp" Condition="'$(TargetOS)' == 'Linux'" /> + <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_windows.rsp" Condition="'$(TargetOS)' == 'Windows_NT'" /> - + <_rspFileContent Include="$([System.IO.File]::ReadAllText(%(_rspFile.Identity)))" /> - + @@ -115,8 +118,9 @@ "$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))" - $(RunTestsCommand) --rsp-file "$(MonoRspFile)" - $(RunTestsCommand) --rsp-file "$(TestRspFile)" + + $(RunTestsCommand) --rsp-file "$(MonoRspFile)" + $(RunTestsCommand) --rsp-file "$(TestRspFile)" diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index e0a2a43c9a8384..37add714a07160 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -300,6 +300,10 @@ true + + mono.issues.rsp + + true diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index cda8a12dc618b5..c286eb87492768 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -4,7 +4,7 @@ $(ToolRuntimeRID) $(NoWarn);NU1603;NU1605 - true + true $(DefaultOSGroup) $(ConfigurationGroup) $(DefaultOSGroup) @@ -66,7 +66,7 @@ + Condition="'$(RuntimeFlavor)' != 'Mono'"> @@ -78,7 +78,7 @@ + Condition="'$(RuntimeFlavor)' == 'Mono'"> diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 746c65c35836a8..c3eb763877de49 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -65,6 +65,8 @@ --> call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD% ./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD" + + $(HelixCommand) --rsp-file "$(MonoRspFileName)" + + Windows_NT + Linux + OSX + + x64 + $(ArchGroup) + + Debug + + $(OSGroup).$(Platform).$(Configuration) + + + + + $(MSBuildThisFileDirectory) + $(ProjectDir)src\ + $(ArtifactsBinDir)mono\$(PlatformConfigPathPart)\ + + $(ArtifactsObjDir)mono\$(MSBuildProjectName)\ + + + + + 5.0.0 + + + false + $(PackageVersion) + + preview8 + + + + + true + true + true + true + true + true + + + + 8.0 + true + + + + + Portable + + + + + false + - diff --git a/src/mono/Directory.Build.targets b/src/mono/Directory.Build.targets index 92465d4434802e..da331b322fb132 100644 --- a/src/mono/Directory.Build.targets +++ b/src/mono/Directory.Build.targets @@ -1,4 +1,3 @@ - diff --git a/src/mono/configure.ac b/src/mono/configure.ac index 86993d83184810..7a038f59e9f151 100644 --- a/src/mono/configure.ac +++ b/src/mono/configure.ac @@ -5024,21 +5024,23 @@ case "$host" in SQLITE3="libsqlite3.so" ;; *-*-*linux*) - AC_PATH_X - dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh` - AC_MSG_CHECKING(for the soname of libX11.so) - for i in $x_libraries $dlsearch_path; do - for r in 4 5 6; do - if test -f $i/libX11.so.$r; then - X11=libX11.so.$r - AC_MSG_RESULT($X11) - fi + if test "x$with_core" != "xonly"; then + AC_PATH_X + dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh` + AC_MSG_CHECKING(for the soname of libX11.so) + for i in $x_libraries $dlsearch_path; do + for r in 4 5 6; do + if test -f $i/libX11.so.$r; then + X11=libX11.so.$r + AC_MSG_RESULT($X11) + fi + done done - done - - if test "x$X11" = "xlibX11.so"; then - AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]); - X11=libX11.so.6 + + if test "x$X11" = "xlibX11.so"; then + AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]); + X11=libX11.so.6 + fi fi ;; esac diff --git a/src/mono/dir.common.props b/src/mono/dir.common.props deleted file mode 100644 index 00282d2c81186b..00000000000000 --- a/src/mono/dir.common.props +++ /dev/null @@ -1,102 +0,0 @@ - - - - - $(__BuildArch) - x64 - x64 - - $(__BuildType) - Debug - Debug - Release - Checked - - $(__BuildOS) - Windows_NT - Linux - OSX - - - <__BuildOS>$(BuildOS) - <__BuildArch>$(BuildArch) - - $(BuildType) - $(BuildArch) - - $(BuildOS).$(BuildArch).$(BuildType) - - - - - - - <__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory) - $(__ProjectDir)\ - $(ProjectDir)\..\..\ - $(MSBuildThisFileDirectory) - - $(RootRepoDir)artifacts\obj\mono\$(MSBuildProjectName)\ - - $(__SourceDir)\ - $(ProjectDir)src\ - - $(__RootBinDir)\ - $(RootRepoDir)artifacts\ - - $(__BinDir)\ - $(RootBinDir)bin\mono\$(PlatformConfigPathPart)\ - - - - - - 5.0.0 - - - false - $(PackageVersion) - - preview8 - - - - - true - true - true - true - true - - true - - - - - 8.0 - true - - - - - Portable - - - - - - - true - - - - - true - - - - - false - - - diff --git a/src/mono/mono.proj b/src/mono/mono.proj index e3842117bf9e1e..3b7451daf7e88a 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -20,7 +20,7 @@ <_MonoConfigureParams Condition="$(MonoEnableLLVM) == true">$(_MonoConfigureParams) --enable--llvm - <_MonoConfigureParams>$(_MonoConfigureParams) --with-core=only CFLAGS="$(_MonoExtraCFLAGS)" CXXFLAGS="$(_MonoExtraCXXFLAGS)" + <_MonoConfigureParams>$(_MonoConfigureParams) --with-core=only CC=clang CXX=clang++ CFLAGS="$(_MonoExtraCFLAGS)" CXXFLAGS="$(_MonoExtraCXXFLAGS)" @@ -39,19 +39,22 @@ <_MonoBuildParams>/p:MONO_BUILD_DIR_PREFIX=""$(MonoObjDir)"" /p:MONO_ENABLE_NETCORE=true /p:CL_MPCount=8 /v:minimal <_MonoBuildParams Condition="$(MonoEnableLLVM) == true">/p:MONO_ENABLE_LLVM=true $(_MonoBuildParams) + <_MonoBuildPlatform Condition="'$(Platform)' == 'x64'">x64 + <_MonoBuildPlatform Condition="'$(Platform)' == 'x86'">win32 - + - <_MonoRuntimeFilePath Condition="'$(BuildOS)' == 'Windows_NT'">$(MonoObjDir)$(Platform)\Bin\$(Configuration)\mono-2.0-sgen.dll - <_MonoRuntimeFilePath Condition="'$(BuildOS)' == 'OSX'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib + <_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'">$(MonoObjDir)x64\Bin\$(Configuration)\mono-2.0-sgen.dll + <_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x86'">$(MonoObjDir)Win32\Bin\$(Configuration)\mono-2.0-sgen.dll + <_MonoRuntimeFilePath Condition="'$(TargetsOSX)' == 'true'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib <_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.so - <_CoreClrFileName Condition="'$(BuildOS)' == 'Windows_NT'">coreclr.dll - <_CoreClrFileName Condition="'$(BuildOS)' == 'OSX'">libcoreclr.dylib + <_CoreClrFileName Condition="'$(TargetsWindows)' == 'true'">coreclr.dll + <_CoreClrFileName Condition="'$(TargetsOSX)' == 'true'">libcoreclr.dylib <_CoreClrFileName Condition="'$(_CoreClrFileName)' == ''">libcoreclr.so diff --git a/src/mono/msvc/Directory.Build.props b/src/mono/msvc/Directory.Build.props new file mode 100644 index 00000000000000..4de865b5f1e158 --- /dev/null +++ b/src/mono/msvc/Directory.Build.props @@ -0,0 +1,3 @@ + + + diff --git a/src/mono/msvc/Directory.Build.targets b/src/mono/msvc/Directory.Build.targets new file mode 100644 index 00000000000000..c43cec29bd65d2 --- /dev/null +++ b/src/mono/msvc/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/src/mono/netcore/CoreFX.issues.rsp b/src/mono/netcore/CoreFX.issues.rsp index 57fca8178b414c..3c05a6ac3ae01e 100644 --- a/src/mono/netcore/CoreFX.issues.rsp +++ b/src/mono/netcore/CoreFX.issues.rsp @@ -26,6 +26,13 @@ # https://github.com/mono/mono/issues/14858 -nomethod System.Collections.Specialized.Tests.NameValueCollectionCtorTests.Ctor_NegativeCapacity_ThrowsArgumentOutOfRangeException +#################################################################### +## System.Collections.Concurrent.Tests +#################################################################### + +# fails only with release mono +-nomethod System.Collections.Concurrent.Tests.ConcurrentQueueTests.ReferenceTypes_NulledAfterDequeue + #################################################################### ## System.Diagnostics.Tracing.Tests #################################################################### @@ -353,6 +360,9 @@ -nomethod System.Reflection.Tests.AssemblyTests.LoadFile_PartiallyQualifiedPath_ThrowsArgumentException -nomethod System.Reflection.Tests.AssemblyTests.LoadFile_NoSuchPath_ThrowsFileNotFoundException +# fails on Helix +-nomethod System.Reflection.Tests.AssemblyTests.LoadFromStream_Location_IsEmpty + #################################################################### ## System.Runtime.InteropServices.Tests #################################################################### @@ -800,6 +810,15 @@ -nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromNativeImagePath_PartiallyQualifiedPath_ThrowsArgumentException -nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromNativeImagePath_PartiallyQualifiedPath_ThrowsArgumentException2 +# fails +-nomethod System.Runtime.Loader.Tests.DefaultLoadContextTests.LoadNonExistentInDefaultContext +-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.GetLoadContextTest_ValidUserAssembly +-nomethod System.Runtime.Loader.Tests.DefaultLoadContextTests.LoadInDefaultContext +-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromAssemblyName_AssemblyNotFound +-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadAssemblyByPath_ValidUserAssembly +-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadAssemblyByStream_ValidUserAssembly +-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromAssemblyName_ValidTrustedPlatformAssembly + #################################################################### ## System.Reflection.MetadataLoadContext.Tests #################################################################### @@ -831,6 +850,13 @@ -nomethod System.Tests.ReflectionTests.* -nomethod System.Net.Http.Tests.Utf8StringContentTests.* +#################################################################### +## System.Text.RegularExpressions.Tests +#################################################################### + +# hits OOM +-nomethod System.Text.RegularExpressions.Tests.RegexMatchTests.Match_Timeout_Loop_Throws + #################################################################### ## System.ComponentModel.Composition.Registration.Tests #################################################################### diff --git a/src/mono/netcore/CoreFX.issues_linux.rsp b/src/mono/netcore/CoreFX.issues_linux.rsp index b442e548ecd7a4..5cd79c59942da3 100644 --- a/src/mono/netcore/CoreFX.issues_linux.rsp +++ b/src/mono/netcore/CoreFX.issues_linux.rsp @@ -37,3 +37,13 @@ # https://github.com/mono/mono/issues/18067 LLVM: try-catch doesn't catch an exception -nomethod System.Reflection.Tests.BindingFlagsDoNotWrapTests.* + +# fail on Helix on RedHat systems because libgdiplus can't be loaded +-nomethod System.Runtime.Serialization.Formatters.Tests.BinaryFormatterTests.RoundtripManyObjectsInOneStream +-nomethod System.Runtime.Serialization.Formatters.Tests.BinaryFormatterTests.ValidateBasicObjectsRoundtrip +-nomethod System.Resources.Tests.ResourceManagerTests.GetObject_Images +-nomethod System.Resources.Tests.ResourceManagerTests.GetObject_Images_ResourceSet +-nomethod System.Resources.Tests.ResourceManagerTests.GetResourceSet_Images +-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.BinaryFormattedResources +-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.StreamResources +-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.BinaryFormattedResourcesWithoutTypeName diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj index d9a33a740e50e2..97c177be9f2b8a 100644 --- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -33,9 +33,6 @@ - $(BuildType) - $(BuildArch) - arm true false diff --git a/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs b/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs index 40bf279960a7ad..bc13dd6c316f74 100644 --- a/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs +++ b/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs @@ -153,7 +153,7 @@ static Exception GetExceptionForHRInternal (int errorCode, IntPtr errorInfo) return new System.NotFiniteNumberException (); case HResults.COR_E_NOTSUPPORTED: return new System.NotSupportedException (); - case HResults.COR_E_NULLREFERENCE: + case HResults.E_POINTER: return new System.NullReferenceException (); case HResults.COR_E_OBJECTDISPOSED: return new System.ObjectDisposedException (""); @@ -220,16 +220,16 @@ static Exception GetExceptionForHRInternal (int errorCode, IntPtr errorInfo) case HResults.COR_E_AMBIGUOUSIMPLEMENTATION: case HResults.COR_E_CANNOTUNLOADAPPDOMAIN: case HResults.COR_E_CONTEXTMARSHAL: - case HResults.COR_E_HOSTPROTECTION: + //case HResults.COR_E_HOSTPROTECTION: case HResults.COR_E_INSUFFICIENTMEMORY: case HResults.COR_E_INVALIDCOMOBJECT: case HResults.COR_E_KEYNOTFOUND: case HResults.COR_E_MISSINGSATELLITEASSEMBLY: case HResults.COR_E_SAFEARRAYRANKMISMATCH: case HResults.COR_E_SAFEARRAYTYPEMISMATCH: - case HResults.COR_E_SAFEHANDLEMISSINGATTRIBUTE: - case HResults.COR_E_SEMAPHOREFULL: - case HResults.COR_E_THREADSTOP: + //case HResults.COR_E_SAFEHANDLEMISSINGATTRIBUTE: + //case HResults.COR_E_SEMAPHOREFULL: + //case HResults.COR_E_THREADSTOP: case HResults.COR_E_TIMEOUT: case HResults.COR_E_WAITHANDLECANNOTBEOPENED: case HResults.DISP_E_OVERFLOW: diff --git a/src/mono/netcore/nuget/Directory.Build.props b/src/mono/netcore/nuget/Directory.Build.props index a4160fb5fa7f54..56e8310b2cd2e5 100644 --- a/src/mono/netcore/nuget/Directory.Build.props +++ b/src/mono/netcore/nuget/Directory.Build.props @@ -14,16 +14,12 @@ <_parseDistroRid>$(__DistroRid) - <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.12-x64 + <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetsOSX)' == 'true'">osx.10.12-x64 <_distroRidIndex>$(_parseDistroRid.IndexOfAny("-")) <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1)) $(_parseDistroRid.SubString(0, $(_distroRidIndex))) win10 - $(_parseDistroRid.SubString($(_archRidIndex))) - $(Platform) - $(BuildArch) - $(OSRid) Windows_NT;OSX;Android;Linux;FreeBSD @@ -43,7 +39,7 @@ <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">Windows_NT - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(__BuildOS)' != ''">$(__BuildOS) + <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(OSGroup)' != ''">$(OSGroup) <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false diff --git a/src/mono/netcore/nuget/builds.targets b/src/mono/netcore/nuget/builds.targets index d58f010d3939b8..6aa99f6694ecac 100644 --- a/src/mono/netcore/nuget/builds.targets +++ b/src/mono/netcore/nuget/builds.targets @@ -9,7 +9,7 @@ true - false + false