WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 35cf56e

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[release/10.0.1xx] Source code updates from dotnet/dotnet (#1528)
* 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 Microsoft Build versions to 17.11.48 * Remove Microsoft Build package version entries Removed specific versions for Microsoft Build packages. * Update Microsoft.Build and Microsoft.Build.Tasks.Core versions --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 539fbb7 commit 35cf56e

File tree

6 files changed

+31
-47
lines changed

6 files changed

+31
-47
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-4090eb3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4090eb30/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-18f6e60" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-18f6e60a/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

‎eng/Version.Details.props‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.0.3</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildTasksCorePackageVersion>18.0.3</MicrosoftBuildTasksCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25570.103</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.2</SystemCommandLinePackageVersion>
1311
</PropertyGroup>
1412
<!--Property group for alternate package version names-->
1513
<PropertyGroup>
1614
<!-- dotnet/dotnet dependencies -->
17-
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
18-
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
1915
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
2016
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
2117
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="4090eb301f5e5db13760aa57eeb32b516c42c56b" BarId="291507" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="18f6e60aa4755c2be56b2d45165a135d64d4f710" BarId="291651" />
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>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
7+
<Sha>18f6e60aa4755c2be56b2d45165a135d64d4f710</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25569.104">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25570.103">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
13+
<Sha>18f6e60aa4755c2be56b2d45165a135d64d4f710</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
16-
<Dependency Name="Microsoft.Build" Version="18.0.3">
17-
<Uri>https://github.com/dotnet/dotnet</Uri>
18-
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
16+
<Dependency Name="Microsoft.Build" Version="17.11.48">
17+
<Uri>https://github.com/dotnet/msbuild</Uri>
18+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.3">
21-
<Uri>https://github.com/dotnet/dotnet</Uri>
22-
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
20+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.48">
21+
<Uri>https://github.com/dotnet/msbuild</Uri>
22+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
2323
</Dependency>
2424
</ToolsetDependencies>
2525
</Dependencies>

‎eng/Versions.props‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
<Project>
22

3-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
3+
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<!-- This repo version -->
7-
<VersionPrefix>10.0.1</VersionPrefix>
8-
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
6+
<VersionPrefix>10.0.102</VersionPrefix>
7+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
8+
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11+
912
<!-- Opt-in repo features -->
1013
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
11-
<!-- Prohibit the usage of .NET Standard 1.x dependencies. -->
12-
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1314
</PropertyGroup>
15+
1416
<PropertyGroup>
17+
<!-- msbuild -->
18+
<MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
19+
<MicrosoftBuildTasksCoreVersion>17.11.48</MicrosoftBuildTasksCoreVersion>
1520
<!-- nuget -->
1621
<NuGetVersioningVersion>6.12.1</NuGetVersioningVersion>
1722
<!-- runtime -->
18-
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
23+
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
1924
</PropertyGroup>
2025

2126
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dotnet": "10.0.100"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25569.104",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25570.103",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

‎src/Directory.Packages.props‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,17 @@
1313
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />
1414
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
1515

16+
<!-- MSBuild dependencies -->
17+
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
18+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
19+
1620
<!-- NuGet dependencies -->
1721
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersioningVersion)" />
1822

1923
<!-- Runtime dependencies -->
2024
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2125
</ItemGroup>
2226

23-
<!--
24-
MSBuild - need to use older packages when targeting net8.0 since the newer versions only support net472 and net9.0+.
25-
When tareting the latest .NET the version must also be lower or equal to one specified in
26-
https://github.com/dotnet/sdk/blob/main/src/Layout/redist/minimumMSBuildVersion#L1
27-
-->
28-
29-
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
30-
<PackageVersion Include="Microsoft.Build" Version="17.11.31" />
31-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.31" />
32-
</ItemGroup>
33-
34-
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' != 'net472'">
35-
<PackageVersion Include="Microsoft.Build" Version="17.11.31" />
36-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.31" />
37-
</ItemGroup>
38-
39-
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
40-
<PackageVersion Include="Microsoft.Build" Version="17.15.0-preview-25353-11" />
41-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25353-11" />
42-
</ItemGroup>
43-
4427
<!-- External dependencies -->
4528
<ItemGroup>
4629
<!-- libgit2 used for integration tests -->

0 commit comments

Comments
 (0)