Skip to content

Commit 36b9aa3

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220627.1 (#28323)
[main] Update dependencies from dotnet/arcade
1 parent 781ca24 commit 36b9aa3

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22316.2">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.1">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
44+
<Sha>640c1cc2a140b322c4f30f6d6b85f35f0c4c7313</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22316.2">
46+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22327.1">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
48+
<Sha>640c1cc2a140b322c4f30f6d6b85f35f0c4c7313</Sha>
4949
</Dependency>
5050
</ToolsetDependencies>
5151
</Dependencies>

eng/common/templates/steps/send-to-helix.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/
44
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
55
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
6-
HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
6+
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
77
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
@@ -12,7 +12,7 @@ parameters:
1212
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1313
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
1414
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
15-
XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
15+
XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
1616
XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects
1717
XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects
1818
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
@@ -22,14 +22,14 @@ parameters:
2222
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2323
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
2424
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
25-
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
25+
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2626
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
2727
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2828
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2929
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3030

3131
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
32+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3333
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3434
env:
3535
BuildConfig: $(_BuildConfig)
@@ -59,7 +59,7 @@ steps:
5959
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6060
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6161
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
62+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6363
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6464
env:
6565
BuildConfig: $(_BuildConfig)

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ function InitializeBuildTool() {
573573
ExitWithExitCode 1
574574
}
575575
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
576-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
576+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
577577
} elseif ($msbuildEngine -eq "vs") {
578578
try {
579579
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function InitializeBuildTool {
312312
# return values
313313
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
314314
_InitializeBuildToolCommand="msbuild"
315-
_InitializeBuildToolFramework="netcoreapp3.1"
315+
_InitializeBuildToolFramework="net7.0"
316316
}
317317

318318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"rollForward": "latestMajor"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22316.2",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22316.2"
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.1"
1313
}
1414
}

0 commit comments

Comments
 (0)