Skip to content

Commit

Permalink
Merge in 'release/7.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Feb 15, 2024
2 parents 2aef67c + 38ab85f commit dff486f
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 57 deletions.
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,77 +58,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24114.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.24108.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -258,9 +258,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24114.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24114.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24114.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24114.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24114.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24114.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24114.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24114.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24114.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24114.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24114.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24114.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24114.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.116"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24114.2",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24114.4",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

0 comments on commit dff486f

Please sign in to comment.