Skip to content

Commit 8c0ceaf

Browse files
[main] Update dependencies from dotnet/arcade (#6518)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9b22fac commit 8c0ceaf

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
12+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22572.6">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
16+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22572.6">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
20+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22572.6">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
24+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22572.6">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
28+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22572.6">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
44+
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
7979
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8080
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
81-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22572.6</MicrosoftDotNetXUnitExtensionsVersion>
81+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
8282
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8383
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8484
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

eng/common/templates/steps/source-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ steps:
6363
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
6464
fi
6565
66+
runtimeOsArgs=
67+
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
68+
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
69+
fi
70+
6671
publishArgs=
6772
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
6873
publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
7580
$internalRuntimeDownloadArgs \
7681
$internalRestoreArgs \
7782
$targetRidArgs \
83+
$runtimeOsArgs \
7884
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
7985
/p:ArcadeBuildFromSource=true
8086
displayName: Build

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json"
511511
# determine if global.json contains a "runtimes" entry
512512
global_json_has_runtimes=false
513513
if command -v jq &> /dev/null; then
514-
if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then
514+
if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then
515515
global_json_has_runtimes=true
516516
fi
517517
elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100",
3+
"dotnet": "7.0.102",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(DotNetRuntime60Version)"
@@ -11,8 +11,8 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6",
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23073.6",
1616
"Microsoft.Build.Traversal": "3.2.0",
1717
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
1818
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)