Skip to content

Commit 5829ab0

Browse files
nagilsonnagilson
authored
Merge pull request #9599 from dotnet/darc-release/10.0.1xx-6b5cb72a-a49d-4ea6-b69d-ae537f9ee877
[release/10.0.1xx] Source code updates from dotnet/dotnet
2 parents caf0e5b + 5042c5f commit 5829ab0

File tree

20 files changed

+65
-63
lines changed

20 files changed

+65
-63
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)" />
3131
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" /> <!-- Pin transitive dependency to avoid vulnerable 6.0.0 version. -->
3232
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
33-
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" /> <!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->
33+
<PackageVersion Include="System.Formats.Asn1" Version="10.0.1" /> <!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->
3434
<PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
3535
<PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
3636
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" /> <!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->

‎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-02dfa78" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-02dfa783/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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ 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.25604.105</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.2</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
12-
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
13-
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
14-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
15-
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>
16-
<SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.3</SystemDiagnosticsDiagnosticSourcePackageVersion>
17-
<SystemFormatsAsn1PackageVersion>9.0.3</SystemFormatsAsn1PackageVersion>
18-
<SystemIOPipelinesPackageVersion>9.0.3</SystemIOPipelinesPackageVersion>
19-
<SystemTextEncodingsWebPackageVersion>9.0.3</SystemTextEncodingsWebPackageVersion>
20-
<SystemTextJsonPackageVersion>9.0.3</SystemTextJsonPackageVersion>
12+
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
13+
<MicrosoftExtensionsLoggingPackageVersion>10.0.1</MicrosoftExtensionsLoggingPackageVersion>
14+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
15+
<MicrosoftExtensionsLoggingConsolePackageVersion>10.0.1</MicrosoftExtensionsLoggingConsolePackageVersion>
16+
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
17+
<SystemFormatsAsn1PackageVersion>10.0.1</SystemFormatsAsn1PackageVersion>
18+
<SystemIOPipelinesPackageVersion>10.0.1</SystemIOPipelinesPackageVersion>
19+
<SystemTextEncodingsWebPackageVersion>10.0.1</SystemTextEncodingsWebPackageVersion>
20+
<SystemTextJsonPackageVersion>10.0.1</SystemTextJsonPackageVersion>
2121
<!-- dotnet/runtime dependencies -->
22-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
22+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
2323
</PropertyGroup>
2424
<!--Property group for alternate package version names-->
2525
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
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="02dfa783c1f4223a5590a1b689ef381c337db1ab" BarId="293404" />
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>02dfa783c1f4223a5590a1b689ef381c337db1ab</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.25604.105">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
13+
<Sha>02dfa783c1f4223a5590a1b689ef381c337db1ab</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
16-
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
16+
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
18+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
20+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.1">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
22+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3">
24+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
26+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.3">
28+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.1">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
30+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3">
32+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
34+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.3">
36+
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>feff23845f6205a1ece39e1bd9b978948a52295a</Sha>
38+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.3">
40+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.1">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>feff23845f6205a1ece39e1bd9b978948a52295a</Sha>
42+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Text.Json" Version="9.0.3">
44+
<Dependency Name="System.Text.Json" Version="10.0.1">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>feff23845f6205a1ece39e1bd9b978948a52295a</Sha>
46+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
4747
</Dependency>
48-
<Dependency Name="System.IO.Pipelines" Version="9.0.3">
48+
<Dependency Name="System.IO.Pipelines" Version="10.0.1">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>feff23845f6205a1ece39e1bd9b978948a52295a</Sha>
50+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
5151
</Dependency>
52-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.3">
52+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.1">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>feff23845f6205a1ece39e1bd9b978948a52295a</Sha>
54+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
5555
</Dependency>
5656
</ToolsetDependencies>
5757
</Dependencies>

‎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>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2004.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-azurelinux-3
66+
image: 1es-mariner-2
6767
os: linux
6868
${{ else }}:
6969
pool:

‎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.25604.105"
1717
}
1818
}

‎src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.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-
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
55
<Description>Contracts for extending Template Engine</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

‎src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.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-
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
55
<Description>Contracts for extending Microsoft.TemplateEngine.Core</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

‎src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.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-
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
55
<Description>Common operations for instantiating templates using forward-only input stream operations</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

0 commit comments

Comments
 (0)