Skip to content

Commit

Permalink
Merge commit 'a345a00343aa14a693aec75a3d56fc07e99e517f'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirroring committed Dec 10, 2024
2 parents 357543a + a345a00 commit d7d6de5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<add key="darc-int-dotnet-aspnetcore-4e4e1fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4e4e1fc3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-1cce779" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1cce7796/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-ed8c6ae" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-ed8c6aec/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
Expand All @@ -21,6 +21,7 @@
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-b1003b4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-b1003b4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1db7b9d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1db7b9dd/nuget/v3/index.json" />
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@
<Sha>5a1972348bdf1daf0ae6c93e6d1ee89400e02cc4</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.12.12">
<Dependency Name="Microsoft.Build" Version="17.12.18">
<Uri>/~https://github.com/dotnet/msbuild</Uri>
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.12.12-preview-24571-01">
<Dependency Name="Microsoft.Build.Localization" Version="17.12.18-preview-24610-04">
<Uri>/~https://github.com/dotnet/msbuild</Uri>
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.12-preview-24571-01">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.18-preview-24610-04">
<Uri>/~https://github.com/dotnet/msbuild</Uri>
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.24602.3">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildVersion>17.12.12</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.12-preview-24571-01</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.12.18</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.18-preview-24610-04</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.12</MinimumVSVersion>
</PropertyGroup>
Expand Down

0 comments on commit d7d6de5

Please sign in to comment.