Skip to content

Commit df39b2a

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20221108.7 (#45042)
[release/6.0] Update dependencies from dotnet/arcade
1 parent aec52eb commit df39b2a

File tree

5 files changed

+14
-22
lines changed

5 files changed

+14
-22
lines changed

NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-943474c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-943474ca/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-41de762" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-efcore-41de762-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-2/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-efcore-41de762-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-1/nuget/v3/index.json" />
139
<!-- End: Package sources from dotnet-efcore -->
1410
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1511
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,12 +23,8 @@
2723
<clear />
2824
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2925
<!-- Begin: Package sources from dotnet-efcore -->
30-
<add key="darc-int-dotnet-efcore-41de762-1" value="true" />
31-
<add key="darc-int-dotnet-efcore-41de762-2" value="true" />
32-
<add key="darc-int-dotnet-efcore-41de762" value="true" />
3326
<!-- End: Package sources from dotnet-efcore -->
3427
<!-- Begin: Package sources from dotnet-runtime -->
35-
<add key="darc-int-dotnet-runtime-943474c" value="true" />
3628
<!-- End: Package sources from dotnet-runtime -->
3729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3830
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.2">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
285+
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.2">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.7">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
290+
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.2">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.7">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
294+
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.2">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.7">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
298+
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.11</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.11</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

eng/common/dotnet-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ done
5252
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
5353
cpuname=$(uname -m)
5454
case $cpuname in
55-
aarch64)
55+
arm64|aarch64)
5656
buildarch=arm64
5757
;;
5858
amd64|x86_64)
@@ -61,7 +61,7 @@ case $cpuname in
6161
armv*l)
6262
buildarch=arm
6363
;;
64-
i686)
64+
i[3-6]86)
6565
buildarch=x86
6666
;;
6767
*)

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7"
3434
}
3535
}

0 commit comments

Comments
 (0)