Manual darc update for arcade and coreclr (dotnet/corefx#34977)

* Remove target to print MCUrl now that helix sdk always prints it

* Run darc update for dotnet/arcade

* Run darc update for dotnet\coreclr

* Fix build after Environment pushed down to coreclr

Commit migrated from https://github.com/dotnet/corefx/commit/28c46ef8a123864178c099580b7eb3c8eda3f495

diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
index 2fe46f5..0520902 100644 (file)
--- a/eng/sendtohelix.proj
+++ b/eng/sendtohelix.proj
@@ -122,17 +122,4 @@
       </HelixWorkItem>
     </ItemGroup>
   </Target>
-
-  <Target Name="ShowMissionControlUrl"
-          AfterTargets="StartTestRuns"
-          Condition="'$(OfficialBuildId)' != ''">
-    <PropertyGroup>
-      <_McUser>dotnet-mc-bot-2</_McUser>
-      <_McHelixType>$([System.String]::Copy('$(HelixType)').ToLowerInvariant().Replace('/', '~2F'))</_McHelixType>
-      <_McHelixSource>$([System.String]::Copy('$(HelixSource)').ToLowerInvariant().Replace('/', '~2F'))</_McHelixSource>
-      <_McUrl>https://mc.dot.net/#/user/$(_McUser)/$(_McHelixSource)/$(_McHelixType)/$(OfficialBuildId)</_McUrl>
-    </PropertyGroup>
-
-    <Message Importance="High" Text="Results will be available at $(_McUrl)" />
-  </Target>
 </Project>

diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index ccc07a1..ef4c519 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
     <DefaultReferenceExclusions Include="System.Diagnostics.Debug" />
+    <DefaultReferenceExclusions Include="System.Runtime.Extensions" />
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <ReferenceFromRuntime Include="System.Runtime" />
     <ReferenceFromRuntime Include="System.Threading" />

diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index 279acd3..0e607a8 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -21,17 +21,8 @@
     <Compile Include="System\CodeDom\Compiler\IndentedTextWriter.cs" />
     <Compile Include="System\Context.cs" />
     <Compile Include="System\Diagnostics\Stopwatch.cs" />
-    <Compile Include="System\Environment.cs" />
-    <Compile Include="System\Environment.SpecialFolder.cs" />
-    <Compile Include="System\Environment.SpecialFolderOption.cs" />
     <Compile Include="System\LoaderOptimization.cs" />
     <Compile Include="System\LoaderOptimizationAttribute.cs" />
-    <Compile Include="$(CommonPath)\CoreLib\System\OperatingSystem.cs">
-      <Link>Common\CoreLib\System\OperatingSystem.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\System\PlatformID.cs">
-      <Link>Common\CoreLib\System\PlatformID.cs</Link>
-    </Compile>
     <Compile Include="System\IO\StringReader.cs" />
     <Compile Include="System\IO\StringWriter.cs" />
     <Compile Include="System\IO\BufferedStream.cs" />
@@ -72,14 +63,29 @@
       <Link>CoreLib\System\Text\ValueStringBuilder.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot' or '$(TargetGroup)' == 'uap'">
+  <ItemGroup Condition="'$(TargetsAOT)' == 'true'">
+    <Compile Include="System\Environment.cs" />
+    <Compile Include="System\Environment.SpecialFolder.cs" />
+    <Compile Include="System\Environment.SpecialFolderOption.cs" />
+    <Compile Condition="'$(TargetsWindows)' == 'true'" Include="System\Environment.Windows.cs" />
+    <Compile Include="$(CommonPath)\CoreLib\System\OperatingSystem.cs">
+      <Link>Common\CoreLib\System\OperatingSystem.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\CoreLib\System\PlatformID.cs">
+      <Link>Common\CoreLib\System\PlatformID.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreappaot'">
+    <Compile Condition="'$(TargetsWindows)' == 'true'" Include="System\Environment.Win32.cs" />
+    <Compile Condition="'$(TargetsUnix)' == 'true'" Include="System\Environment.Unix.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
     <Compile Include="System\Environment.WinRT.cs" />
     <Compile Include="$(CommonPath)\CoreLib\System\WinRTFolderPaths.cs">
       <Link>Common\CoreLib\System\WinRTFolderPaths.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uapaot' and '$(TargetGroup)' != 'uap'">
-    <Compile Include="System\Environment.Win32.cs" />
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\secur32\Interop.GetUserNameExW.cs">
       <Link>Common\Interop\Windows\secur32\Interop.GetUserNameExW.cs</Link>
     </Compile>
@@ -92,7 +98,6 @@
     <Compile Include="$(CommonPath)\CoreLib\System\PasteArguments.Windows.cs">
       <Link>Common\CoreLib\System\PasteArguments.Windows.cs</Link>
     </Compile>
-    <Compile Include="System\Environment.Windows.cs" />
     <Compile Include="System\Runtime\Versioning\VersioningHelper.Windows.cs" />
     <Compile Include="System\Diagnostics\Stopwatch.Windows.cs" />
     <Compile Include="$(CommonPath)\CoreLib\System\IO\Win32Marshal.cs">
@@ -179,7 +184,6 @@
   </ItemGroup>
   <!-- UNIX -->
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
-    <Compile Include="System\Environment.Unix.cs" />
     <Compile Include="System\Runtime\Versioning\VersioningHelper.Unix.cs" />
     <Compile Include="System\Diagnostics\Stopwatch.Unix.cs" />
     <Compile Include="$(CommonPath)\Interop\OSX\Interop.Libraries.cs">

diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 439e805..1593eb8 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -9,7 +9,7 @@
     <NoWarn>$(NoWarn);1698;0436</NoWarn>
     <ProjectGuid>{844A2A0B-4169-49C3-B367-AFDC4894E487}</ProjectGuid>
     <Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
-    <DefineConstants>$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == 'uapaot'">$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetGroup)'=='netcoreapp' or '$(TargetGroup)'=='uap'">
     <DefineConstants>$(DefineConstants);netstandard;FEATURE_APPX</DefineConstants>