Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade mono/linker dotnet/ll…
Browse files Browse the repository at this point in the history 
…vm-project (#37302)

* Update dependencies from https://github.com/dotnet/arcade build 20200530.1

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitConsoleRunner
 From Version 5.0.0-beta.20278.4 -> To Version 5.0.0-beta.20280.1

* Update dependencies from https://github.com/mono/linker build 20200602.1

Microsoft.NET.ILLink.Tasks
 From Version 5.0.0-preview.3.20301.1 -> To Version 5.0.0-preview.3.20302.1

* Update dependencies from https://github.com/dotnet/llvm-project build 20200601.1

runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
 From Version 9.0.1-alpha.1.20268.2 -> To Version 9.0.1-alpha.1.20301.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] and dotnet-maestro[bot] authored Jun 3, 2020
1 parent 53bc2a3 commit e25517e
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 67 deletions.
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20278.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20278.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96c65ad967d2abbbd8e770ba752a6b64255ec669</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -118,29 +118,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>71b9284907ebc69e5f80b491a51084c75e0ef7d3</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20268.2">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20301.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d179d1b519fb0b3e4a4b3f15ee55920e310c582f</Sha>
<Sha>214f08d74f9266a03e5836fe08855e6cd8b03b87</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-preview.4.20202.18">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -170,9 +170,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20301.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20302.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>c1b6d6c86d0635f03257cdd16023d178ba29d133</Sha>
<Sha>95d8c21c8d9bfc8cad107ff36fa44851f61bb28c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20301.2">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20278.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20278.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20278.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20278.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20278.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20278.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20278.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20278.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20278.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20278.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20280.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20280.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20280.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20280.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20280.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20280.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20280.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20280.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>
Expand Down Expand Up @@ -115,14 +115,14 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20301.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20302.1</MicrosoftNETILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20268.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20268.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20268.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20268.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20268.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20268.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20301.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20301.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20301.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20301.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20301.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20301.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
7 changes: 6 additions & 1 deletion eng/common/sdk-task.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ try {
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
}
if ($xcopyMSBuildToolsFolder -eq $null) {
throw 'Unable to get xcopy downloadable version of msbuild'
}

$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
$global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe"
}

Expand Down
19 changes: 16 additions & 3 deletions eng/common/tools.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
return $global:_MSBuildExe
}

$vsMinVersionReqdStr = '16.5'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
$vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { '15.9' }
$vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
$vsMinVersion = [Version]::new($vsMinVersionStr)

# Try msbuild command available in the environment.
Expand Down Expand Up @@ -327,8 +330,18 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
$xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild'
$vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
} else {
$vsMajorVersion = $vsMinVersion.Major
$xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha"
#if vs version provided in global.json is incompatible then use the default version for xcopy msbuild download
if($vsMinVersion -lt $vsMinVersionReqd){
Write-Host "Using xcopy-msbuild version of $vsMinVersionReqdStr.0-alpha since VS version $vsMinVersionStr provided in global.json is not compatible"
$vsMajorVersion = $vsMinVersionReqd.Major
$vsMinorVersion = $vsMinVersionReqd.Minor
}
else{
$vsMajorVersion = $vsMinVersion.Major
$vsMinorVersion = $vsMinVersion.Minor
}

$xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0-alpha"
}

$vsInstallDir = $null
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20278.4",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20278.4",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20278.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20278.4",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20280.1",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20280.1",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20280.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20280.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18",
"Microsoft.Build.NoTargets": "1.0.53",
Expand Down

0 comments on commit e25517e

Please sign in to comment.