Skip to content

Commit 3dc1ce3

Browse files
author
Mirroring
committed
Merge commit '49b20c7a25912e88506fa0d0c2479b6208ef6a70'
2 parents fecaf46 + 49b20c7 commit 3dc1ce3

File tree

6 files changed

+42
-20
lines changed

6 files changed

+42
-20
lines changed

‎NuGet.config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
88
<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" />
9+
<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" />
10+
<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" />
11+
<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" />
12+
<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" />
913
<!-- End: Package sources from dotnet-runtime -->
1014
<!-- Begin: Package sources from dotnet-winforms -->
1115
<add key="darc-int-dotnet-winforms-fdc2007" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-fdc2007-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-5/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-fdc2007-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-fdc2007-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-fdc2007-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-1/nuget/v3/index.json" />
1220
<!-- End: Package sources from dotnet-winforms -->
1321
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1422
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +30,17 @@
2230
<disabledPackageSources>
2331
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2432
<!-- Begin: Package sources from dotnet-runtime -->
33+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
34+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
35+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
36+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
2537
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
2638
<!-- End: Package sources from dotnet-runtime -->
2739
<!-- Begin: Package sources from dotnet-winforms -->
40+
<add key="darc-int-dotnet-winforms-fdc2007-1" value="true" />
41+
<add key="darc-int-dotnet-winforms-fdc2007-2" value="true" />
42+
<add key="darc-int-dotnet-winforms-fdc2007-3" value="true" />
43+
<add key="darc-int-dotnet-winforms-fdc2007-5" value="true" />
2844
<add key="darc-int-dotnet-winforms-fdc2007" value="true" />
2945
<!-- End: Package sources from dotnet-winforms -->
3046
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24324.7">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
161+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24324.7">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24360.5">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
165+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24324.7">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24360.5">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
169+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24324.7">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24360.5">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
173+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24324.7">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24360.5">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>3fe41d9e97519a4e9b48293906dbf58714ea9a0d</Sha>
177+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24324.7</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24324.7</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24360.5</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24360.5</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

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

Lines changed: 6 additions & 3 deletions
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‎

Lines changed: 6 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24360.5"
1717
},
1818
"sdk": {
1919
"version": "8.0.101"

0 commit comments

Comments
 (0)