Skip to content

Commit 266f9e2

Browse files
dotnet-maestro[bot]DonnaChen888
dotnet-maestro[bot]
and
DonnaChen888
authored
[release/10.0.1xx] Source code updates from dotnet/dotnet (#9563)
* Update dependencies from https://github.com/dotnet/dotnet build 291507 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25568.102 -> 10.0.0-beta.25569.104) System.CommandLine (Version 2.0.1 -> 2.0.1) * Backflow from https://github.com/dotnet/dotnet / 18f6e60 build 291651 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 291651 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25569.104 -> 10.0.0-beta.25570.103) System.CommandLine (Version 2.0.1 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292085 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25570.103 -> 10.0.0-beta.25574.102) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292370 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25574.102 -> 10.0.0-beta.25575.107) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292473 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25575.107 -> 10.0.0-beta.25576.107) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292549 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25576.107 -> 10.0.0-beta.25577.106) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292661 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25577.106 -> 10.0.0-beta.25578.106) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292766 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25578.106 -> 10.0.0-beta.25601.102) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 292938 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25601.102 -> 10.0.0-beta.25601.110) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update dependencies from https://github.com/dotnet/dotnet build 293194 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25601.110 -> 10.0.0-beta.25603.103) System.CommandLine (Version 2.0.2 -> 2.0.2) * Changing the target framework version to NetToolCurrent --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com>
1 parent 11b6fc1 commit 266f9e2

File tree

7 files changed

+22
-20
lines changed

7 files changed

+22
-20
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-115a295-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-115a2957-1/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-5ddd0dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5ddd0ddc/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.2</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>

‎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="115a29577547ce136b754d96d2ebfb184595a923" BarId="291265" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="5ddd0ddc0ebadca21645a05c419ed5a034454605" BarId="293194" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.1">
5+
<Dependency Name="System.CommandLine" Version="2.0.2">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
7+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25568.102">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.103">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
13+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</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: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<Project>
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
2+
3+
<Import Project="Version.Details.props" />
4+
35
<PropertyGroup>
4-
<VersionPrefix>10.0.101</VersionPrefix>
5-
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
6-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
7-
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
8-
<!-- Calculate prerelease label -->
6+
<VersionPrefix>10.0.102</VersionPrefix>
97
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
108
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11+
12+
<!-- Opt-in/out repo features -->
1113
<UsingToolXliff>true</UsingToolXliff>
12-
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1314
</PropertyGroup>
15+
1416
</Project>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.2.25502.107",
3+
"version": "10.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,9 +10,9 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-rc.2.25502.107"
13+
"dotnet": "10.0.100"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103"
1717
}
1818
}

‎tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>$(NetMinimum)</TargetFramework>
5+
<TargetFramework>$(NetToolCurrent)</TargetFramework>
66
<Description>A dotnet CLI tool with commands for template authoring.</Description>
77
<IsPackable>true</IsPackable>
88
<PackAsTool>true</PackAsTool>

‎tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(NetMinimum)</TargetFramework>
4+
<TargetFramework>$(NetToolCurrent)</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<IsPackable>true</IsPackable>
77
<IsShipping>false</IsShipping>

0 commit comments

Comments
 (0)