Skip to content

Commit

Permalink
Merge in 'release/5.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotnet-bot
dotnet-bot committed Jan 3, 2022
2 parents 0390944 + 3b960e4 commit 85e316c
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 39 deletions.
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,57 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21552.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21552.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21552.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21552.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21552.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21552.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21552.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21552.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21552.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21552.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21552.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21552.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21565.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21565.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21565.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21565.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21565.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21565.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21565.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21565.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21565.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21565.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreDotNetHostVersion>
Expand Down
6 changes: 3 additions & 3 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.21552.7",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21552.7",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21565.1",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21565.1",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21565.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21552.7",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21565.1",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
"Microsoft.Build.NoTargets": "2.0.1",
Expand Down

0 comments on commit 85e316c

Please sign in to comment.