Skip to content

Commit 154e31e

Browse files
committed
Merge in 'release/6.0' changes
2 parents e2c3c8e + e8bba19 commit 154e31e

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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-7cca709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-796d2f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-796d2f8b/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-efcore -->
1210
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1311
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,10 +25,8 @@
2725
<clear />
2826
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2927
<!-- Begin: Package sources from dotnet-efcore -->
30-
<add key="darc-int-dotnet-efcore-796d2f8" value="true" />
3128
<!-- End: Package sources from dotnet-efcore -->
3229
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-7cca709" value="true" />
3430
<!-- End: Package sources from dotnet-runtime -->
3531
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3632
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22261.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
285+
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22261.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22314.7">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
290+
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22261.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22314.7">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
294+
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22261.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22314.7">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
298+
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.6</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.6</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22261.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22261.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22261.7"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7"
3434
}
3535
}

0 commit comments

Comments
 (0)