Skip to content

Commit d8bb445

Browse files
committed
Merge in 'release/8.0' changes
2 parents abd8857 + caee7b6 commit d8bb445

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

NuGet.config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
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-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!-- Begin: Package sources from dotnet-winforms -->
1110
<add key="darc-int-dotnet-winforms-41a4bd6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-winforms-41a4bd6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-winforms-41a4bd6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69-1/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-winforms -->
1314
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1415
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +23,10 @@
2223
<disabledPackageSources>
2324
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2425
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-2d7eea2" value="true" />
2626
<!-- End: Package sources from dotnet-runtime -->
2727
<!-- Begin: Package sources from dotnet-winforms -->
28+
<add key="darc-int-dotnet-winforms-41a4bd6-1" value="true" />
29+
<add key="darc-int-dotnet-winforms-41a4bd6-2" value="true" />
2830
<add key="darc-int-dotnet-winforms-41a4bd6" value="true" />
2931
<!-- End: Package sources from dotnet-winforms -->
3032
<!--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.24179.4">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
161+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24179.4">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24204.3">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
165+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24179.4">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24204.3">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
169+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24179.4">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24204.3">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
173+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24179.4">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24204.3">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
177+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</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.24179.4</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24179.4</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24204.3</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24204.3</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

eng/common/templates-official/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
steps:
66
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
7+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
88
displayName: Set skipComponentGovernanceDetection variable
99
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
1010
- task: ComponentGovernanceComponentDetection@0

eng/common/templates/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
steps:
66
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
7+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
88
displayName: Set skipComponentGovernanceDetection variable
99
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
1010
- task: ComponentGovernanceComponentDetection@0

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.24179.4",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24179.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24204.3"
1717
},
1818
"sdk": {
1919
"version": "8.0.101"

0 commit comments

Comments
 (0)