Skip to content

Commit f4b46ee

Browse files
authored
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-965d1642-6bd3-4f0d-a800-49831df85cc5
2 parents e7b6cff + 31a4726 commit f4b46ee

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

NuGet.config

Lines changed: 6 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,11 @@
3737
<!-- End: Package sources from dotnet-runtime -->
3838
<!-- Begin: Package sources from dotnet-templating -->
3939
<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" />
40+
<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" />
41+
<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" />
42+
<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" />
43+
<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" />
44+
<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" />
4045
<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" />
4146
<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" />
4247
<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" />

eng/Version.Details.xml

Lines changed: 8 additions & 8 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">
@@ -354,9 +354,9 @@
354354
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</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">

eng/Versions.props

Lines changed: 3 additions & 3 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>
@@ -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>

0 commit comments

Comments
 (0)