Skip to content

Commit d065e65

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 28b3c5b + c700839 commit d065e65

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-189fbbd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-189fbbd8/nuget/v3/index.json" />
1312
<!-- End: Package sources from dotnet-runtime -->
1413
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1514
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,7 +21,6 @@
2221
<clear />
2322
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2423
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-189fbbd" value="true" />
2624
<!-- End: Package sources from dotnet-runtime -->
2725
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2826
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24201.2">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
44+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24201.2">
46+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
48+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24201.2">
50+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
52+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24201.2">
54+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
5555
<Uri>https://github.com/dotnet/arcade</Uri>
56-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
56+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24201.2">
58+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
60+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24201.2">
62+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
64+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24201.2">
66+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>1a187fd995a9189060237c80041feb5307871a1e</Sha>
68+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6969
</Dependency>
7070
</ToolsetDependencies>
7171
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<!--Package versions-->
5050
<PropertyGroup>
5151
<!-- arcade -->
52-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24201.2</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24201.2</MicrosoftDotNetBuildTasksArchivesVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24201.2</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24201.2</MicrosoftDotNetBuildTasksInstallersVersion>
56-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24201.2</MicrosoftDotNetVersionToolsTasksVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksArchivesVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
56+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24204.4</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
5858
<MicrosoftNETCoreAppRefVersion>6.0.29</MicrosoftNETCoreAppRefVersion>
5959
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.29</MicrosoftNETCoreAppRuntimewinx64Version>

‎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/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "6.0.128"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24201.2",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24201.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24204.4",
88
"Microsoft.Build.NoTargets": "1.0.53"
99
}
1010
}

0 commit comments

Comments
 (0)