diff --git a/eng/pipelines/common/restore-internal-tools.yml b/eng/pipelines/common/restore-internal-tools.yml index 0f1cc000b338e1..50cae78769a57e 100644 --- a/eng/pipelines/common/restore-internal-tools.yml +++ b/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 diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index a6387576a74609..b21e37b1ccdee3 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/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) }} diff --git a/global.json b/global.json index 6a19a4b306a2cd..26b46940658b4d 100644 --- a/global.json +++ b/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", diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index ef7df519ddaa0c..21f3c13e7aa6b1 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -109,7 +109,6 @@ true - $(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink - - - - - + 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 8f58561b29cf7f..0967c19b786940 100644 --- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -115,7 +115,6 @@ true - $(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink