Skip to content

Commit 84228b7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/5.0] Update dependencies from dotnet/arcade (#53937)
* Update dependencies from https://github.com/dotnet/arcade build 20210512.2 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.21160.3 -> To Version 5.0.0-beta.21262.2 * Update dependencies from https://github.com/dotnet/arcade build 20210628.3 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.21160.3 -> To Version 5.0.0-beta.21328.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9d5c191 commit 84228b7

File tree

6 files changed

+256
-44
lines changed

6 files changed

+256
-44
lines changed

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,61 +10,61 @@
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21160.3">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21328.3">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
15+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21160.3">
17+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21328.3">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
19+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21160.3">
21+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21328.3">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
23+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21160.3">
25+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21328.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
27+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21160.3">
29+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21328.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
31+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21160.3">
33+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21328.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
35+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21160.3">
37+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21328.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
39+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21160.3">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21328.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
43+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21160.3">
45+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21328.3">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
47+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21160.3">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21328.3">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
51+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21160.3">
53+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21328.3">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
55+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21160.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21328.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
59+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21160.3">
61+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21328.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
63+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21160.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21328.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>670382be6a978ba401c21c57ba44311199d2682a</Sha>
67+
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
6868
</Dependency>
6969
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
7070
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
</ItemGroup>
4949
<PropertyGroup>
5050
<!-- Arcade dependencies -->
51-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21160.3</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21160.3</MicrosoftDotNetCodeAnalysisVersion>
54-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21160.3</MicrosoftDotNetGenAPIVersion>
55-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21160.3</MicrosoftDotNetGenFacadesVersion>
56-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21160.3</MicrosoftDotNetXUnitExtensionsVersion>
57-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21160.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
58-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksPackagingVersion>
59-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21160.3</MicrosoftDotNetRemoteExecutorVersion>
60-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21160.3</MicrosoftDotNetVersionToolsTasksVersion>
51+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21328.3</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21328.3</MicrosoftDotNetCodeAnalysisVersion>
54+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21328.3</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21328.3</MicrosoftDotNetGenFacadesVersion>
56+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21328.3</MicrosoftDotNetXUnitExtensionsVersion>
57+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21328.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
58+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksPackagingVersion>
59+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21328.3</MicrosoftDotNetRemoteExecutorVersion>
60+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21328.3</MicrosoftDotNetVersionToolsTasksVersion>
6161
<!-- Installer dependencies -->
6262
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
6363
<MicrosoftNETCoreDotNetHostVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreDotNetHostVersion>

‎eng/common/generate-locproject.ps1

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here
3+
[string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json
4+
[switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one
5+
[switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally
6+
)
7+
8+
# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here:
9+
# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task
10+
11+
Set-StrictMode -Version 2.0
12+
$ErrorActionPreference = "Stop"
13+
. $PSScriptRoot\tools.ps1
14+
15+
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
16+
17+
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
18+
$exclusions = @{ Exclusions = @() }
19+
if (Test-Path -Path $exclusionsFilePath)
20+
{
21+
$exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json
22+
}
23+
24+
Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work
25+
26+
# Template files
27+
$jsonFiles = @()
28+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
29+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
30+
31+
$xlfFiles = @()
32+
33+
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
34+
$langXlfFiles = @()
35+
if ($allXlfFiles) {
36+
$null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf'
37+
$firstLangCode = $Matches.1
38+
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
39+
}
40+
$langXlfFiles | ForEach-Object {
41+
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
42+
43+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
44+
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
45+
}
46+
47+
$locFiles = $jsonFiles + $xlfFiles
48+
49+
$locJson = @{
50+
Projects = @(
51+
@{
52+
LanguageSet = $LanguageSet
53+
LocItems = @(
54+
$locFiles | ForEach-Object {
55+
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
56+
$continue = $true
57+
foreach ($exclusion in $exclusions.Exclusions) {
58+
if ($outputPath.Contains($exclusion))
59+
{
60+
$continue = $false
61+
}
62+
}
63+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
64+
if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') {
65+
Remove-Item -Path $sourceFile
66+
}
67+
if ($continue)
68+
{
69+
if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
70+
return @{
71+
SourceFile = $sourceFile
72+
CopyOption = "LangIDOnPath"
73+
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
74+
}
75+
}
76+
else {
77+
return @{
78+
SourceFile = $sourceFile
79+
CopyOption = "LangIDOnName"
80+
OutputPath = $outputPath
81+
}
82+
}
83+
}
84+
}
85+
)
86+
}
87+
)
88+
}
89+
90+
$json = ConvertTo-Json $locJson -Depth 5
91+
Write-Host "LocProject.json generated:`n`n$json`n`n"
92+
Pop-Location
93+
94+
if (!$UseCheckedInLocProjectJson) {
95+
New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
96+
Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json
97+
}
98+
else {
99+
New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
100+
Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json
101+
102+
if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
103+
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
104+
105+
exit 1
106+
}
107+
else {
108+
Write-Host "Generated LocProject.json and current LocProject.json are identical."
109+
}
110+
}

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
parameters:
2+
# Optional: dependencies of the job
3+
dependsOn: ''
4+
5+
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
6+
pool:
7+
vmImage: vs2017-win2016
8+
9+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
10+
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
11+
12+
SourcesDirectory: $(Build.SourcesDirectory)
13+
CreatePr: true
14+
AutoCompletePr: false
15+
UseLfLineEndings: true
16+
UseCheckedInLocProjectJson: false
17+
LanguageSet: VS_Main_Languages
18+
LclSource: lclFilesInRepo
19+
LclPackageId: ''
20+
RepoType: gitHub
21+
GitHubOrg: dotnet
22+
MirrorRepo: ''
23+
MirrorBranch: main
24+
condition: ''
25+
26+
jobs:
27+
- job: OneLocBuild
28+
29+
dependsOn: ${{ parameters.dependsOn }}
30+
31+
displayName: OneLocBuild
32+
33+
pool: ${{ parameters.pool }}
34+
35+
variables:
36+
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
37+
- name: _GenerateLocProjectArguments
38+
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
39+
-LanguageSet "${{ parameters.LanguageSet }}"
40+
-CreateNeutralXlfs
41+
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
42+
- name: _GenerateLocProjectArguments
43+
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
44+
45+
46+
steps:
47+
- task: Powershell@2
48+
inputs:
49+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
50+
arguments: $(_GenerateLocProjectArguments)
51+
displayName: Generate LocProject.json
52+
condition: ${{ parameters.condition }}
53+
54+
- task: OneLocBuild@2
55+
displayName: OneLocBuild
56+
env:
57+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
58+
inputs:
59+
locProj: eng/Localize/LocProject.json
60+
outDir: $(Build.ArtifactStagingDirectory)
61+
lclSource: ${{ parameters.LclSource }}
62+
lclPackageId: ${{ parameters.LclPackageId }}
63+
isCreatePrSelected: ${{ parameters.CreatePr }}
64+
${{ if eq(parameters.CreatePr, true) }}:
65+
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
66+
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
67+
packageSourceAuth: patAuth
68+
patVariable: ${{ parameters.CeapexPat }}
69+
${{ if eq(parameters.RepoType, 'gitHub') }}:
70+
repoType: ${{ parameters.RepoType }}
71+
gitHubPatVariable: "${{ parameters.GithubPat }}"
72+
${{ if ne(parameters.MirrorRepo, '') }}:
73+
isMirrorRepoSelected: true
74+
gitHubOrganization: ${{ parameters.GitHubOrg }}
75+
mirrorRepo: ${{ parameters.MirrorRepo }}
76+
mirrorBranch: ${{ parameters.MirrorBranch }}
77+
condition: ${{ parameters.condition }}
78+
79+
- task: PublishBuildArtifacts@1
80+
displayName: Publish Localization Files
81+
inputs:
82+
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
83+
PublishLocation: Container
84+
ArtifactName: Loc
85+
condition: ${{ parameters.condition }}
86+
87+
- task: PublishBuildArtifacts@1
88+
displayName: Publish LocProject.json
89+
inputs:
90+
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
91+
PublishLocation: Container
92+
ArtifactName: Loc
93+
condition: ${{ parameters.condition }}

‎eng/common/tools.ps1

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
371371
}
372372

373373
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
374-
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
374+
375+
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
376+
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
377+
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
378+
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
379+
} else {
380+
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
381+
}
382+
383+
return $global:_MSBuildExe
375384
}
376385

377386
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -527,7 +536,7 @@ function GetDefaultMSBuildEngine() {
527536

528537
function GetNuGetPackageCachePath() {
529538
if ($env:NUGET_PACKAGES -eq $null) {
530-
# Use local cache on CI to ensure deterministic build.
539+
# Use local cache on CI to ensure deterministic build.
531540
# Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116
532541
# use global cache in dev builds to avoid cost of downloading packages.
533542
# For directory normalization, see also: https://github.com/NuGet/Home/issues/7968

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21160.3",
16-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3",
17-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21160.3",
18-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21160.3",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21328.3",
16+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3",
17+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21328.3",
18+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21328.3",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
2121
"Microsoft.Build.NoTargets": "2.0.1",

0 commit comments

Comments
 (0)