Attempt to fix restore internal tools (#2255)

* Force re-install of nuget authenticator

* Update dotnet tools to latest daily build

* Remove AddUntrackedResourcesForSourceLink workaround for sourcelink

Author: safern

eng/pipelines/common/restore-internal-tools.yml

@@ -13,6 +13,7 @@ steps:
   - task: NuGetAuthenticate@0
     inputs:
       nuGetServiceConnections: 'dotnet-core-internal-tooling'
+      forceReinstallCredentialProvider: true
 
   - task: DotNetCoreCLI@2
     displayName: Restore internal tools

eng/pipelines/libraries/base-job.yml

@@ -47,6 +47,7 @@ jobs:
         - _warnAsErrorArg: ''
         - _testScopeArg: ''
         - _extraHelixArguments: ''
+        - _crossBuildPropertyArg: ''
 
         - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 

global.json

@@ -5,7 +5,7 @@
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "5.0.100-alpha1-015772"
+    "dotnet": "5.0.100-alpha.1.20073.4"
   },
   "native-tools": {
     "cmake": "3.14.2",

src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -109,7 +109,6 @@
   <PropertyGroup>
     <!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <CoreCompileDependsOn>$(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink</CoreCompileDependsOn>
   </PropertyGroup>
 
   <!--
@@ -456,16 +455,5 @@
 
   <Import Project="CreateRuntimeRootILLinkDescriptorFile.targets" />
 
-  <Target Name="CreateRuntimeRootIlLinkDescFile" BeforeTargets="CoreCompile" DependsOnTargets="_CreateILLinkRuntimeRootDescriptorFile">
-  </Target>
-
-  <!-- This is working around dotnet/coreclr#26371 until dotnet/sourcelink#392 gets solved -->
-  <Target Name="AddUntrackedResourcesForSourceLink"
-          Condition="'$(BuildingInsideVisualStudio)' != 'true'"
-          BeforeTargets="CoreCompile"
-          DependsOnTargets="SetEmbeddedFilesFromSourceControlManagerUntrackedFiles;_GenerateResxSource" >
-    <ItemGroup>
-      <EmbeddedFiles Include="@(GeneratedResxSource)" />
-    </ItemGroup>
-  </Target>
+  <Target Name="CreateRuntimeRootIlLinkDescFile" BeforeTargets="CoreCompile" DependsOnTargets="_CreateILLinkRuntimeRootDescriptorFile"/>
 </Project>

src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -115,7 +115,6 @@
   <PropertyGroup>
     <!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <CoreCompileDependsOn>$(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink</CoreCompileDependsOn>
   </PropertyGroup>
 
   <!--