Skip to content

Commit 5c6be24

Browse files
committed
Merge in 'release/7.0' changes
2 parents e31fb6b + f3d7019 commit 5c6be24

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
44+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23114.3">
46+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23164.3">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
48+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23114.3">
50+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23164.3">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
52+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
5353
</Dependency>
5454
</ToolsetDependencies>
5555
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<MicrosoftExtensionsLoggingVersion>7.0.0</MicrosoftExtensionsLoggingVersion>
2626
</PropertyGroup>
2727
<PropertyGroup Label="Dependencies from dotnet/arcade">
28-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>
28+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTemplatingVersion>
2929
</PropertyGroup>
3030
<PropertyGroup Label="Other dependencies">
3131
<!-- NB: Roslyn version affects the minimum required Visual Studio version -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"rollForward": "latestMajor"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3"
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3"
1313
}
1414
}

0 commit comments

Comments
 (0)