8000 Merge pull request #9125 from dotnet/darc-main-13efe2a6-aff7-4ca3-bea… · dotnet/templating@0e87747 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0e87747

Browse files
SimonZhao888SimonZhao888
authored
Merge pull request #9125 from dotnet/darc-main-13efe2a6-aff7-4ca3-bea9-6c16f2b2f232
[main] Source code updates from dotnet/dotnet
2 parents 588248c + 83b092a commit 0e87747

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

‎eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="0785dfdb947fe301da00b7c331d6adfdeda5b283" BarId="272949" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="7cd445ec6160e1edbe0c96caa5aa395822403d7f" BarId="273094" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25324.103">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25325.106">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>0785dfdb947fe301da00b7c331d6adfdeda5b283</Sha>
7+
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25324.103">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25325.106">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>0785dfdb947fe301da00b7c331d6adfdeda5b283</Sha>
13+
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<!-- Non-maestro versions -->
1717
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
18-
<SystemCommandLinePackageVersion>2.0.0-beta6.25324.103</SystemCommandLinePackageVersion>
18+
<SystemCommandLinePackageVersion>2.0.0-beta6.25325.106</SystemCommandLinePackageVersion>
1919
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
2020
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
2121
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>

‎eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "10.0.100-preview.6.25315.102"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25324.103"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25325.106"
77
}
88
}

0 commit comments

Comments
 (0)
0