Skip to content

Commit 019069b

Browse files
committed
Merge in 'release/7.0' changes
2 parents e2a3f56 + e38f298 commit 019069b

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- Begin: Package sources from dotnet-efcore -->
77
<!-- End: Package sources from dotnet-efcore -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-int-dotnet-runtime-d037e07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d037e070/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,7 +26,6 @@
2726
<!-- Begin: Package sources from dotnet-efcore -->
2827
<!-- End: Package sources from dotnet-efcore -->
2928
<!-- Begin: Package sources from dotnet-runtime -->
30-
<add key="darc-int-dotnet-runtime-d037e07" value="true" />
3129
<!-- End: Package sources from dotnet-runtime -->
3230
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3331
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23060.4">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
307+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23060.4">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23073.6">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
312+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23060.4">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23073.6">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
316+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23060.4">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
320+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.2</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23073.6</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23073.6</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23060.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23073.6"
3232
}
3333
}

0 commit comments

Comments
 (0)