Skip to content

Commit fceb30c

Browse files
author
Mirroring
committed
Merge commit '59498475c428128d4d15d4dbede25c8acde99b9c'
2 parents 6fba1ce + 5949847 commit fceb30c

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-aspnetcore -->
2323
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
24+
<add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
2525
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2626
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2727
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -30,6 +30,7 @@
3030
<!-- End: Package sources from dotnet-runtime -->
3131
<!-- Begin: Package sources from dotnet-templating -->
3232
<add key="darc-pub-dotnet-templating-7e0acf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7e0acf90/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-7e0acf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7e0acf90-1/nuget/v3/index.json" />
3334
<!-- End: Package sources from dotnet-templating -->
3435
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3536
<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: 12 additions & 12 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.5">
58+
<Dependency Name="Microsoft.Build" Version="17.8.15">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
60+
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.5-preview-24055-02">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.15-preview-24613-11">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
64+
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.5-preview-24055-02">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.15-preview-24613-11">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
68+
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</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.24574.1">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24612.4">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298-
<Sha>0d10fb38d28484fc4189a5441d258d60c3cf2ca3</Sha>
298+
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24574.1">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24612.4">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303-
<Sha>0d10fb38d28484fc4189a5441d258d60c3cf2ca3</Sha>
303+
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24574.1">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24612.4">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307-
<Sha>0d10fb38d28484fc4189a5441d258d60c3cf2ca3</Sha>
307+
<Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</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>

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.5</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.15</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.5-preview-24055-02</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.15-preview-24613-11</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.24574.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24574.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24574.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
178+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24612.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24612.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24612.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)