Skip to content

Commit 65226bc

Browse files
Tanya Solyanikmmitche
Tanya Solyanik
authored and
mmitche
committed
Merged PR 47118: manual merge from AzDO release/9.0 into AzDO internal/release/9.0
Fixes #4881 ---- #### AI description (iteration 1) #### PR Classification Manual merge from AzDO release/9.0 into AzDO internal/release/9.0. #### PR Summary This pull request updates dependencies and package sources as part of a manual merge. - Updated versions and SHAs for multiple dependencies in `eng/Version.Details.xml`. - Added new package sources in `NuGet.config`. - Updated `dotnet` tool version and SDK versions in `global.json`. - Updated versions for build tasks in `eng/Versions.props`. - Minor documentation update in `eng/common/template-guidance.md`.
2 parents f971ec2 + 2f26946 commit 65226bc

File tree

5 files changed

+42
-18
lines changed

5 files changed

+42
-18
lines changed

‎NuGet.config‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,21 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
1212
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
1316
<!-- End: Package sources from dotnet-runtime -->
1417
<!-- Begin: Package sources from dotnet-winforms -->
1518
<add key="darc-int-dotnet-winforms-f15a0b2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f15a0b23/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-5a82e6f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-winforms-5a82e6f-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-8/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-winforms-5a82e6f-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-7/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-winforms-5a82e6f-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-6/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-winforms-5a82e6f-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-5/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-winforms-5a82e6f-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-4/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-winforms-5a82e6f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-3/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-winforms-5a82e6f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-2/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-winforms-5a82e6f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-1/nuget/v3/index.json" />
1628
<!-- End: Package sources from dotnet-winforms -->
1729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1830
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,9 +40,21 @@
2840
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2941
<!-- Begin: Package sources from dotnet-runtime -->
3042
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
43+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
44+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
45+
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
3146
<!-- End: Package sources from dotnet-runtime -->
3247
<!-- Begin: Package sources from dotnet-winforms -->
3348
<add key="darc-int-dotnet-winforms-f15a0b2" value="true" />
49+
<add key="darc-int-dotnet-winforms-5a82e6f-1" value="true" />
50+
<add key="darc-int-dotnet-winforms-5a82e6f-2" value="true" />
51+
<add key="darc-int-dotnet-winforms-5a82e6f-3" value="true" />
52+
<add key="darc-int-dotnet-winforms-5a82e6f-4" value="true" />
53+
<add key="darc-int-dotnet-winforms-5a82e6f-5" value="true" />
54+
<add key="darc-int-dotnet-winforms-5a82e6f-6" value="true" />
55+
<add key="darc-int-dotnet-winforms-5a82e6f-7" value="true" />
56+
<add key="darc-int-dotnet-winforms-5a82e6f-8" value="true" />
57+
<add key="darc-int-dotnet-winforms-5a82e6f" value="true" />
3458
<!-- End: Package sources from dotnet-winforms -->
3559
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3660
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
157+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25058.5">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25065.2">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
161+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25058.5">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25065.2">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
165+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25058.5">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25065.2">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
169+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25058.5">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25065.2">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
173+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25058.5">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25065.2">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
177+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksInstallersVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksInstallersVersion>
1717
<!-- corefx -->
1818
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1919
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

‎eng/common/template-guidance.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100"
3+
"dotnet": "9.0.102"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25058.5",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25065.2",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)