huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert Arcade version and workaround (#18724)

This commit is contained in:
Chris Ross 2020-01-31 23:29:56 -08:00 committed by GitHub
parent b2e1218346
commit 6255c1ed96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.ps1
View File

@ -342,10 +342,6 @@ if ($tmpBinaryLog) {
$MSBuildArguments += "/bl:$LogDir/Build.binlog" $MSBuildArguments += "/bl:$LogDir/Build.binlog"
} }
# Prevent the root Directory.Build.props and Directory.Build.targets from being imported by files in the TempDir
Copy-Item (Join-Path $EngRoot 'Empty.Directory.Build.props') (Join-Path $TempDir 'Directory.Build.props') -ea Ignore
Copy-Item (Join-Path $EngRoot 'Empty.Directory.Build.targets') (Join-Path $TempDir 'Directory.Build.targets') -ea Ignore
# Capture MSBuild crash logs # Capture MSBuild crash logs
$env:MSBUILDDEBUGPATH = $LogDir $env:MSBUILDDEBUGPATH = $LogDir

2
eng/Empty.Directory.Build.props
View File

@ -1,2 +0,0 @@
<Project>
</Project>

2
eng/Empty.Directory.Build.targets
View File

@ -1,2 +0,0 @@
<Project>
</Project>

12
eng/Version.Details.xml
View File

@ -412,17 +412,17 @@
<Uri>https://github.com/dotnet/extensions</Uri> <Uri>https://github.com/dotnet/extensions</Uri>
<Sha>275e691f7e575f208290d1cbb8cb450f4a3a85d6</Sha> <Sha>275e691f7e575f208290d1cbb8cb450f4a3a85d6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20076.3"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20074.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha> <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20076.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20074.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha> <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20076.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20074.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha> <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20079.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language"> <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20079.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri> <Uri>https://github.com/dotnet/extensions</Uri>

2
eng/Versions.props
View File

@ -60,7 +60,7 @@
--> -->
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20076.3</MicrosoftDotNetGenAPIPackageVersion> <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20074.6</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn --> <!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetPackageVersion> <MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup --> <!-- Packages from dotnet/core-setup -->

3
eng/common/tools.ps1
View File

@ -655,9 +655,6 @@ Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir
Write-PipelineSetVariable -Name 'TMP' -Value $TempDir Write-PipelineSetVariable -Name 'TMP' -Value $TempDir
$env:TEMP=$TempDir
$env:TMP=$TempDir
# Import custom tools configuration, if present in the repo. # Import custom tools configuration, if present in the repo.
# Note: Import in global scope so that the script set top-level variables without qualification. # Note: Import in global scope so that the script set top-level variables without qualification.
if (!$disableConfigureToolsetImport) { if (!$disableConfigureToolsetImport) {

4
global.json
View File

@ -25,7 +25,7 @@
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Yarn.MSBuild": "1.15.2", "Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20076.3", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20074.6",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20076.3" "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20074.6"
} }
} }