Skip to content

Commit 6df0bab

Browse files
dotnet-maestro[bot]vzarytovskii0101
authored
[main] Update dependencies from dotnet/arcade (#14384)
* Update dependencies from https://github.com/dotnet/arcade build 20221122.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22572.5 * Update dependencies from https://github.com/dotnet/arcade build 20221124.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22574.1 * Update dependencies from https://github.com/dotnet/arcade build 20221125.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22575.1 * Update global.json * Remove a test This test is failing in CI for some reason. But we don't really care about what it tests anyway - having private values in signature files, in which there's really no point * Update dependencies from https://github.com/dotnet/arcade build 20221128.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22578.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: 0101 <[email protected]>
1 parent 71b6329 commit 6df0bab

File tree

10 files changed

+23
-40
lines changed

10 files changed

+23
-40
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22554.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22578.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
13+
<Sha>3817f2b38a05c37c950715f84c95d452bcacfe52</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22554.2">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22578.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
18+
<Sha>3817f2b38a05c37c950715f84c95d452bcacfe52</Sha>
1919
</Dependency>
2020
</ToolsetDependencies>
2121
</Dependencies>

‎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/native/init-compiler.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ if [[ -z "$CC" ]]; then
132132
exit 1
133133
fi
134134

135-
# Only lld version >= 9 can be considered stable
136-
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
135+
# Only lld version >= 9 can be considered stable. lld doesn't support s390x.
136+
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then
137137
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
138138
LDFLAGS="-fuse-ld=lld"
139139
fi

‎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/job/publish-build-assets.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
- job: Asset_Registry_Publish
3535

3636
dependsOn: ${{ parameters.dependsOn }}
37+
timeoutInMinutes: 150
3738

3839
${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
3940
displayName: Publish Assets
@@ -73,12 +74,6 @@ jobs:
7374

7475
- task: NuGetAuthenticate@0
7576

76-
- task: PowerShell@2
77-
displayName: Enable cross-org NuGet feed authentication
78-
inputs:
79-
filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
80-
arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw)
81-
8277
- task: PowerShell@2
8378
displayName: Publish Build Assets
8479
inputs:

‎eng/common/templates/post-build/common-variables.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
variables:
2-
- group: AzureDevOps-Artifact-Feeds-Pats
3-
- group: DotNet-Blob-Feed
4-
- group: DotNet-DotNetCli-Storage
5-
- group: DotNet-MSRC-Storage
62
- group: Publish-Build-Assets
73

84
# Whether the build is internal or not

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ stages:
172172
- task: NuGetAuthenticate@0
173173
displayName: 'Authenticate to AzDO Feeds'
174174

175-
- task: PowerShell@2
176-
displayName: Enable cross-org publishing
177-
inputs:
178-
filePath: eng\common\enable-cross-org-publishing.ps1
179-
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
180-
181175
# Signing validation will optionally work with the buildmanifest file which is downloaded from
182176
# Azure DevOps above.
183177
- task: PowerShell@2

‎eng/common/tools.ps1‎

Lines changed: 3 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') {
@@ -413,6 +413,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
413413
if($vsMinVersion -lt $vsMinVersionReqd){
414414
Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible"
415415
$xcopyMSBuildVersion = $defaultXCopyMSBuildVersion
416+
$vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
416417
}
417418
else{
418419
# If the VS version IS compatible, look for an xcopy msbuild package

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-rc.2.22477.23",
3+
"version": "7.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestPatch"
66
},
77
"tools": {
8-
"dotnet": "7.0.100-rc.2.22477.23",
8+
"dotnet": "7.0.100",
99
"vs": {
1010
"version": "17.2",
1111
"components": [
1212
"Microsoft.VisualStudio.Component.FSharp"
1313
]
1414
},
15-
"xcopy-msbuild": "17.3.1"
15+
"xcopy-msbuild": "17.4.1"
1616
},
1717
"native-tools": {
1818
"perl": "5.32.1.1"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2",
22-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22554.2"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22578.1",
22+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22578.1"
2323
}
2424
}

‎tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,3 @@ val f: x: 'a -> TFirstV_1<'a>
6767
// This should be false, because it's also in the signature file
6868
Assert.True(symbolUse.IsPrivateToFile))
6969
}
70-
71-
[<Fact>]
72-
let ``Private function, with signature file`` () =
73-
SyntheticProject.Create(
74-
{ sourceFile "First" [] with ExtraSource = "let private f3 x = x + 1" }
75-
|> addSignatureFile).Workflow {
76-
checkFile "First" (fun (typeCheckResult: FSharpCheckFileResults) ->
77-
let symbolUse = typeCheckResult.GetSymbolUseAtLocation(6, 14, "let private f3 x = x + 1", ["f3"]) |> Option.defaultWith (fun () -> failwith "no symbol use found")
78-
Assert.False(symbolUse.IsPrivateToFile))
79-
}

0 commit comments

Comments
 (0)