Skip to content

Commit 1c6bd93

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 3941954 + 605e6a3 commit 1c6bd93

File tree

9 files changed

+29
-22
lines changed

9 files changed

+29
-22
lines changed

‎NuGet.config

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-0c8605d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-0c8605d8/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-efcore-0c8605d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-0c8605d8-1/nuget/v3/index.json" />
97
<!-- End: Package sources from dotnet-efcore -->
108
<!-- Begin: Package sources from dotnet-runtime -->
119
<add key="darc-int-dotnet-runtime-d037e07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d037e070/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-runtime-97203d3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97203d38/nuget/v3/index.json" />
1310
<!-- End: Package sources from dotnet-runtime -->
1411
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1512
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,11 +25,8 @@
2825
<clear />
2926
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3027
<!-- Begin: Package sources from dotnet-efcore -->
31-
<add key="darc-int-dotnet-efcore-0c8605d-1" value="true" />
32-
<add key="darc-int-dotnet-efcore-0c8605d" value="true" />
3328
<!-- End: Package sources from dotnet-efcore -->
3429
<!-- Begin: Package sources from dotnet-runtime -->
35-
<add key="darc-int-dotnet-runtime-97203d3" value="true" />
3630
<add key="darc-int-dotnet-runtime-d037e07" value="true" />
3731
<!-- End: Package sources from dotnet-runtime -->
3832
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22561.2">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23060.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
307+
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22561.2">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23060.4">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
312+
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22561.2">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23060.4">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
316+
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22561.2">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23060.4">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
320+
<Sha>ac5977ebf05451c1adcf24a15d16263e4d25fd0c</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.2</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23060.4</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

‎eng/common/cross/toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
22

3+
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
4+
unset(LINUX)
5+
unset(FREEBSD)
6+
unset(ILLUMOS)
7+
unset(ANDROID)
8+
unset(TIZEN)
9+
310
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
411
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
512
set(CMAKE_SYSTEM_NAME FreeBSD)

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎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.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
369-
$defaultXCopyMSBuildVersion = '17.3.1'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
369+
$defaultXCopyMSBuildVersion = '17.4.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23060.4"
3232
}
3333
}

0 commit comments

Comments
 (0)