Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20201…
Browse files Browse the repository at this point in the history
…215.4 (#46190)

[master] Update dependencies from dotnet/arcade


 - Merge branch 'master' into darc-master-7182afa7-4616-4185-bb0f-bf6d141d0210
  • Loading branch information
dotnet-maestro[bot] authored Dec 18, 2020
1 parent 3b070ca commit 75f8346
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,73 +6,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20614.8">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.20614.8">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.20615.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382</Sha>
<Sha>7d638bb082f374f7c8ddbada79f757662df4a246</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.20513.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20614.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20614.8</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20614.8</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20614.8</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20614.8</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20614.8</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20614.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20614.8</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20614.8</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20614.8</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20614.8</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20614.8</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20615.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20615.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20615.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20615.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20615.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20615.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20615.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20615.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20615.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20615.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20615.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20615.4</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-alpha.1.20616.14</MicrosoftNETCoreDotNetHostVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/microbenchmarks.proj
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@
<Timeout>4:00</Timeout>
</HelixWorkItem>
</ItemGroup>
</Project>
</Project>
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20614.8",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20614.8",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20614.8",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20614.8",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20614.8",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20615.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20615.4",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20615.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20615.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20615.4",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20616.14",
"Microsoft.Build.NoTargets": "2.0.1",
Expand Down

0 comments on commit 75f8346

Please sign in to comment.