Skip to content

Commit 8450763

Browse files
dotnet-maestro[bot]tmat
dotnet-maestro[bot]
and
tmat
authored
[release/10.0.1xx] Source code updates from dotnet/dotnet (#1492)
* Update dependencies from https://github.com/dotnet/dotnet build 288391 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 17.11.31 -> 18.0.2) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25513.109 -> 10.0.0-beta.25523.108) System.CommandLine (Version 2.0.0 -> 2.0.0) * Update dependencies from https://github.com/dotnet/dotnet build 288435 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 18.0.2 -> 18.0.2) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25523.108 -> 10.0.0-beta.25523.113) System.CommandLine (Version 2.0.0 -> 2.0.0) * Update dependencies from https://github.com/dotnet/dotnet build 288919 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 18.0.2 -> 18.0.2) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25523.113 -> 10.0.0-beta.25528.106) System.CommandLine (Version 2.0.0 -> 2.0.0) * Update dependencies from https://github.com/dotnet/dotnet build 289051 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 18.0.2 -> 18.0.3) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25528.106 -> 10.0.0-beta.25530.104) System.CommandLine (Version 2.0.0 -> 2.0.0) * Update dependencies from https://github.com/dotnet/dotnet build 289152 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 18.0.3 -> 18.0.3) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25530.104 -> 10.0.0-beta.25531.102) System.CommandLine (Version 2.0.0 -> 2.0.0) * Fix Json version * Fix MSBuild versions * Update dependencies from https://github.com/dotnet/dotnet build 289521 Updated Dependencies: Microsoft.Build, Microsoft.Build.Tasks.Core (Version 18.0.3 -> 18.0.3) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25531.102 -> 10.0.0-beta.25554.104) System.CommandLine (Version 2.0.0 -> 2.0.1) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: tmat <tomas.matousek@microsoft.com>
1 parent 469f7be commit 8450763

File tree

9 files changed

+82
-44
lines changed

9 files changed

+82
-44
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-3a0c62b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-3a0c62bf/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-8ee0cc0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-8ee0cc0b/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: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25513.109</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
11-
<!-- dotnet/msbuild dependencies -->
12-
<MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
13-
<MicrosoftBuildTasksCorePackageVersion>17.11.31</MicrosoftBuildTasksCorePackageVersion>
9+
<MicrosoftBuildPackageVersion>18.0.3</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildTasksCorePackageVersion>18.0.3</MicrosoftBuildTasksCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
1413
</PropertyGroup>
1514
<!--Property group for alternate package version names-->
1615
<PropertyGroup>
1716
<!-- dotnet/dotnet dependencies -->
18-
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
19-
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
20-
<!-- dotnet/msbuild dependencies -->
2117
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
2218
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
19+
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
20+
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
2321
</PropertyGroup>
2422
</Project>

‎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="3a0c62bf027fbcb8683a13e78a5b21ae19028ca3" BarId="286911" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1" BarId="289521" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0">
5+
<Dependency Name="System.CommandLine" Version="2.0.1">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3a0c62bf027fbcb8683a13e78a5b21ae19028ca3</Sha>
7+
<Sha>8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25513.109">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25554.104">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>3a0c62bf027fbcb8683a13e78a5b21ae19028ca3</Sha>
13+
<Sha>8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
16-
<Dependency Name="Microsoft.Build" Version="17.11.31">
17-
<Uri>https://github.com/dotnet/msbuild</Uri>
18-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
16+
<Dependency Name="Microsoft.Build" Version="18.0.3">
17+
<Uri>https://github.com/dotnet/dotnet</Uri>
18+
<Sha>8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.31">
21-
<Uri>https://github.com/dotnet/msbuild</Uri>
22-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
20+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.3">
21+
<Uri>https://github.com/dotnet/dotnet</Uri>
22+
<Sha>8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1</Sha>
2323
</Dependency>
2424
</ToolsetDependencies>
2525
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<!-- nuget -->
1515
<NuGetVersioningVersion>6.12.1</NuGetVersioningVersion>
1616
<!-- runtime -->
17-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
17+
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
1818
</PropertyGroup>
1919
</Project>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3-
# disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45
#
56
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174
}
174175
}
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179+
if ($dotnetEngSource -ne $null) {
180+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181+
}
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185+
if ($dotnetToolsSource -ne $null) {
186+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187+
}
188+
176189
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5-
# disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67
#
78
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89
#
@@ -66,10 +67,8 @@ EnableInternalPackageSource() {
6667
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6768
if [ "$?" == "0" ]; then
6869
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
70+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
71+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7372

7473
# Add the source name to PackageSources for credential handling
7574
PackageSources+=("$PackageSourceName")
@@ -175,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
175174
fi
176175
done
177176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179+
if [ "$?" == "0" ]; then
180+
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181+
fi
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185+
if [ "$?" == "0" ]; then
186+
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187+
fi
188+
178189
# I want things split line by line
179190
PrevIFS=$IFS
180191
IFS=$'\n'

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14-
# Location of the MicroBuild output folder
15-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
16-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1714

1815
continueOnError: false
1916

2017
steps:
2118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2219
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
23-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
20+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2421
- task: UseDotNet@2
2522
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2623
inputs:
2724
packageType: sdk
2825
version: 8.0.x
29-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
30-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
26+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3130
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3231

3332
- script: |
@@ -65,7 +64,7 @@ steps:
6564
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6665
env:
6766
TeamName: $(_TeamName)
68-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
67+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
6968
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7069
continueOnError: ${{ parameters.continueOnError }}
7170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
8584
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
8685
env:
8786
TeamName: $(_TeamName)
88-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
87+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
8988
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9089
continueOnError: ${{ parameters.continueOnError }}
9190
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎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.1.25451.107",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,10 +10,10 @@
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.1.25451.107"
13+
"dotnet": "10.0.100-rc.2.25502.107"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.109",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

‎src/Directory.Packages.props‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,34 @@
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-
2016
<!-- NuGet dependencies -->
2117
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersioningVersion)" />
2218

2319
<!-- Runtime dependencies -->
2420
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2521
</ItemGroup>
2622

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+
2744
<!-- External dependencies -->
2845
<ItemGroup>
2946
<!-- libgit2 used for integration tests -->

0 commit comments

Comments
 (0)