Skip to content

Commit 40ddb62

Browse files
MiYanniMiYanni
authored
[release/8.0.3xx] Update dependencies from dotnet/arcade (#19979)
2 parents 2bcaf21 + 02bdc3a commit 40ddb62

File tree

6 files changed

+65
-15
lines changed

6 files changed

+65
-15
lines changed

‎NuGet.config

+44
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,46 @@
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-aspnetcore -->
1010
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-3/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
1115
<!-- End: Package sources from dotnet-aspnetcore -->
1216
<!-- Begin: Package sources from dotnet-emsdk -->
1317
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
1422
<!-- End: Package sources from dotnet-emsdk -->
1523
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1624
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" />
1729
<!-- End: Package sources from dotnet-emsdk -->
1830
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1931
<!-- End: Package sources from dotnet-windowsdesktop -->
2032
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2133
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2234
<!-- Begin: Package sources from dotnet-runtime -->
2335
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
2440
<!-- End: Package sources from dotnet-runtime -->
2541
<!-- Begin: Package sources from dotnet-sdk -->
2642
<add key="darc-int-dotnet-sdk-3ecaf32" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320/nuget/v3/index.json" />
43+
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-7/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-6/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-5/nuget/v3/index.json" />
46+
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-4/nuget/v3/index.json" />
47+
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-3/nuget/v3/index.json" />
48+
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-2/nuget/v3/index.json" />
49+
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-11/nuget/v3/index.json" />
50+
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-10/nuget/v3/index.json" />
2751
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-1/nuget/v3/index.json" />
2852
<!-- End: Package sources from dotnet-sdk -->
2953
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -43,15 +67,35 @@
4367
<disabledPackageSources>
4468
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4569
<!-- Begin: Package sources from dotnet-aspnetcore -->
70+
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="true" />
71+
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="true" />
72+
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="true" />
73+
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="true" />
4674
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="true" />
4775
<!-- End: Package sources from dotnet-aspnetcore -->
4876
<!-- Begin: Package sources from dotnet-runtime -->
77+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
78+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
79+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
80+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
4981
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
5082
<!-- Begin: Package sources from dotnet-sdk -->
5183
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="true" />
84+
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="true" />
85+
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="true" />
86+
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="true" />
87+
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="true" />
88+
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="true" />
89+
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="true" />
90+
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="true" />
91+
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="true" />
5292
<add key="darc-int-dotnet-sdk-3ecaf32" value="true" />
5393
<!-- End: Package sources from dotnet-sdk -->
5494
<!-- Begin: Package sources from dotnet-windowsdesktop -->
95+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" />
96+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="true" />
97+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="true" />
98+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="true" />
5599
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="true" />
56100
<!-- Begin: Package sources from dotnet-sdk -->
57101
<!-- End: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24352.1">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24359.3">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
219+
<Sha>db87887481d4110c09a1004191002482fdd7e4f2</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24352.1">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24359.3">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
224+
<Sha>db87887481d4110c09a1004191002482fdd7e4f2</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24352.1">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24359.3">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
228+
<Sha>db87887481d4110c09a1004191002482fdd7e4f2</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24352.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24359.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎eng/common/templates-official/job/publish-build-assets.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,14 @@ jobs:
140140
BARBuildId: ${{ parameters.BARBuildId }}
141141
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
142142

143-
- task: PowerShell@2
143+
- task: AzureCLI@2
144144
displayName: Publish Using Darc
145145
inputs:
146-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
147-
arguments: -BuildId $(BARBuildId)
146+
azureSubscription: "Darc: Maestro Production"
147+
scriptType: ps
148+
scriptLocation: scriptPath
149+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
150+
arguments: -BuildId $(BARBuildId)
148151
-PublishingInfraVersion 3
149152
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
150153
-WaitPublishingFinish true

‎eng/common/templates/job/publish-build-assets.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,14 @@ jobs:
136136
BARBuildId: ${{ parameters.BARBuildId }}
137137
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
138138

139-
- task: PowerShell@2
139+
- task: AzureCLI@2
140140
displayName: Publish Using Darc
141141
inputs:
142-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
143-
arguments: -BuildId $(BARBuildId)
142+
azureSubscription: "Darc: Maestro Production"
143+
scriptType: ps
144+
scriptLocation: scriptPath
145+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
146+
arguments: -BuildId $(BARBuildId)
144147
-PublishingInfraVersion 3
145148
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
146149
-WaitPublishingFinish true

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24359.3"
1616
}
1717
}

0 commit comments

Comments
 (0)