Skip to content

Commit c7eda53

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 2331d16 + f13994e commit c7eda53

File tree

8 files changed

+21
-22
lines changed

8 files changed

+21
-22
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
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-544c7e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-544c7e6e/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1110
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,7 +20,6 @@
2120
<disabledPackageSources>
2221
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2322
<!-- Begin: Package sources from dotnet-runtime -->
24-
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
2523
<!-- End: Package sources from dotnet-runtime -->
2624
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2725
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24209.2">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
80+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24171.6">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24209.2">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
84+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24209.2">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
88+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24171.6">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24209.2">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
92+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24171.6">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24209.2">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
96+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎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>7.0.0-beta.24171.6</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24171.6</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24209.2</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24209.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5656
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎eng/common/templates-official/job/job.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,15 @@ jobs:
116116

117117
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
118118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
119-
- task: MicroBuildSigningPlugin@3
119+
- task: MicroBuildSigningPlugin@4
120120
displayName: Install MicroBuild plugin
121121
inputs:
122122
signType: $(_SignType)
123123
zipSources: false
124124
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
125125
env:
126126
TeamName: $(_TeamName)
127+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
127128
continueOnError: ${{ parameters.continueOnError }}
128129
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
129130

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

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

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

‎eng/common/templates-official/variables/pool-providers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

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

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

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

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.117",
3+
"dotnet": "7.0.118",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.6"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2"
1717
},
1818
"sdk": {
19-
"version": "7.0.117"
19+
"version": "7.0.118"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)