Skip to content

Commit ede5104

Browse files
author
Mirroring
committed
Merge commit 'e81bc473f87d8703b7f6650ac2710aacd8f56a2b'
2 parents 7280562 + e81bc47 commit ede5104

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
4646
<!-- End: Package sources from dotnet-emsdk -->
4747
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
48-
<add key="darc-pub-DotNet-msbuild-Trusted-1ea1660" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1ea16607/nuget/v3/index.json" />
48+
<add key="darc-pub-DotNet-msbuild-Trusted-1c20264" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1c202646/nuget/v3/index.json" />
4949
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5050
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
5151
<!-- End: Package sources from dotnet-roslyn-analyzers -->
5252
<!-- Begin: Package sources from dotnet-runtime -->
5353
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
5454
<!-- End: Package sources from dotnet-runtime -->
5555
<!-- Begin: Package sources from dotnet-templating -->
56-
<add key="darc-pub-dotnet-templating-1828413" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-18284132/nuget/v3/index.json" />
56+
<add key="darc-pub-dotnet-templating-a2862fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc/nuget/v3/index.json" />
5757
<!-- End: Package sources from dotnet-templating -->
5858
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5959
<add key="darc-int-dotnet-windowsdesktop-f971ec2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f971ec24/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.201">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
6+
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25111.3">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25112.5">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
10+
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25111.3">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25112.5">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
15+
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.3">
@@ -69,18 +69,18 @@
6969
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.12">
72+
<Dependency Name="Microsoft.Build" Version="17.13.13">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>1ea16607ac1c0646d3f309d9457a4d2b75517de1</Sha>
74+
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.12-preview-25111-07">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.13-preview-25112-07">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>1ea16607ac1c0646d3f309d9457a4d2b75517de1</Sha>
78+
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.12-preview-25111-07">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.13-preview-25112-07">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>1ea16607ac1c0646d3f309d9457a4d2b75517de1</Sha>
83+
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.201-beta.25070.3">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25112.2">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
602+
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25112.2">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
607+
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.12</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.12-preview-25111-07</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.13.13</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.13.13-preview-25112-07</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>
@@ -191,7 +191,7 @@
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25111.3</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25112.5</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -259,7 +259,7 @@
259259
<PropertyGroup Label="Infrastructure and test only dependencies">
260260
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
261261
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
262-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
262+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25112.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Manually updated">
265265
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)