Skip to content

Commit 8dfa25b

Browse files
Merge pull request #11237 from dotnet/darc-release/9.0-4776e431-c2be-4fb4-b94c-e826abe750e6
[release/9.0] Update dependencies from dotnet/arcade
2 parents 0424953 + f11688e commit 8dfa25b

File tree

6 files changed

+21
-15
lines changed

6 files changed

+21
-15
lines changed

NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-e1f1988" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e1f19886/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!-- Begin: Package sources from dotnet-winforms -->
11-
<add key="darc-int-dotnet-winforms-01b97e2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-01b97e23/nuget/v3/index.json" />
1210
<!-- End: Package sources from dotnet-winforms -->
1311
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1412
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,10 +22,8 @@
2422
<disabledPackageSources>
2523
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2624
<!-- Begin: Package sources from dotnet-runtime -->
27-
<add key="darc-int-dotnet-runtime-e1f1988" value="true" />
2825
<!-- End: Package sources from dotnet-runtime -->
2926
<!-- Begin: Package sources from dotnet-winforms -->
30-
<add key="darc-int-dotnet-winforms-01b97e2" value="true" />
3127
<!-- End: Package sources from dotnet-winforms -->
3228
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3329
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25555.4">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
170+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25515.2">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25555.4">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
174+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25555.4">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
178+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25515.2">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25555.4">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
186+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25555.4</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ jobs:
145145
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
146146
is1ESPipeline: ${{ parameters.is1ESPipeline }}
147147

148+
# Darc is targeting 8.0, so make sure it's installed
149+
- task: UseDotNet@2
150+
inputs:
151+
version: 8.0.x
152+
148153
- task: AzureCLI@2
149154
displayName: Publish Using Darc
150155
inputs:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ stages:
305305

306306
- task: NuGetAuthenticate@1
307307

308+
# Darc is targeting 8.0, so make sure it's installed
309+
- task: UseDotNet@2
310+
inputs:
311+
version: 8.0.x
312+
308313
- task: AzureCLI@2
309314
displayName: Publish Using Darc
310315
inputs:

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": "9.0.0-beta.25515.2",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4"
1717
},
1818
"sdk": {
1919
"version": "9.0.111"

0 commit comments

Comments
 (0)