Skip to content

Commit 67f35aa

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-f2a4a54f-669f-4bde-9b9e-8669ebb6b83b
2 parents 3101300 + 37b42c2 commit 67f35aa

File tree

4 files changed

+44
-35
lines changed

4 files changed

+44
-35
lines changed

‎NuGet.config

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
2828
<!-- End: Package sources from dotnet-aspnetcore -->
2929
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
30-
<add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
30+
<add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
3131
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3232
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3333
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -37,6 +37,15 @@
3737
<!-- End: Package sources from dotnet-runtime -->
3838
<!-- Begin: Package sources from dotnet-templating -->
3939
<add key="darc-pub-dotnet-templating-67efdba" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-67efdba8/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
46+
<add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
47+
<add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
48+
<add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
4049
<!-- End: Package sources from dotnet-templating -->
4150
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4251
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.18">
58+
<Dependency Name="Microsoft.Build" Version="17.8.19">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
60+
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.18-preview-25066-03">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.19-preview-25071-04">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
64+
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.18-preview-25066-03">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.19-preview-25071-04">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
68+
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
@@ -293,18 +293,18 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24629.6">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.6">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298-
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
298+
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24629.6">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25104.6">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303-
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
303+
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24629.6">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.6">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307-
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
307+
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
308308
</Dependency>
309309
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
310310
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -349,14 +349,14 @@
349349
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
350350
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
351351
</Dependency>
352-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
352+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
353353
<Uri>https://github.com/dotnet/source-build-externals</Uri>
354-
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
354+
<Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
359+
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
496+
<Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
501+
<Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
505+
<Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
509+
<Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.113</VersionPrefix>
14+
<VersionPrefix>8.0.114</VersionPrefix>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.18</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.19</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.18-preview-25066-03</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.19-preview-25071-04</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -175,9 +175,9 @@
175175
</PropertyGroup>
176176
<!-- Dependencies from https://github.com/dotnet/razor -->
177177
<PropertyGroup>
178-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24629.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24629.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24629.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
178+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25104.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25104.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25104.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
1919
}
2020
}

0 commit comments

Comments
 (0)