Skip to content

Commit 492feef

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/arcade build 20210705.2
Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21355.2
1 parent 71dd6b0 commit 492feef

File tree

8 files changed

+67
-17
lines changed

8 files changed

+67
-17
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,22 @@
296296
<Uri>https://github.com/dotnet/runtime</Uri>
297297
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21311.3">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21355.2">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
301+
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
302302
<SourceBuild RepoName="arcade" ManagedOnly="true" />
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21311.3">
304+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21355.2">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
306+
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21311.3">
308+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21355.2">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
310+
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21311.3">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21355.2">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
314+
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
315315
</Dependency>
316316
</ToolsetDependencies>
317317
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreVersion>
139139
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignVersion>
140140
<!-- Packages from dotnet/arcade -->
141-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksInstallersVersion>
142-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksTemplatingVersion>
141+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21355.2</MicrosoftDotNetBuildTasksInstallersVersion>
142+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21355.2</MicrosoftDotNetBuildTasksTemplatingVersion>
143143
</PropertyGroup>
144144
<!--
145145

‎eng/common/SetupNugetSources.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) {
158158
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
159159
}
160160

161+
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
162+
if ($dotnet6Source -ne $null) {
163+
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164+
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
165+
}
166+
161167
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then
129129
PackageSources+=('dotnet5-internal-transport')
130130
fi
131131

132+
# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
133+
grep -i "<add key=\"dotnet6\"" $ConfigFile
134+
if [ "$?" == "0" ]; then
135+
grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
136+
if [ "$?" != "0" ]; then
137+
echo "Adding dotnet6-internal to the packageSources."
138+
PackageSourcesNodeFooter="</packageSources>"
139+
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
140+
141+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
142+
fi
143+
PackageSources+=('dotnet6-internal')
144+
145+
grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
146+
if [ "$?" != "0" ]; then
147+
echo "Adding dotnet6-internal-transport to the packageSources."
148+
PackageSourcesNodeFooter="</packageSources>"
149+
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
150+
151+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
152+
fi
153+
PackageSources+=('dotnet6-internal-transport')
154+
fi
155+
132156
# I want things split line by line
133157
PrevIFS=$IFS
134158
IFS=$'\n'

‎eng/common/generate-locproject.ps1

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to
2525

2626
# Template files
2727
$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
28+
$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
29+
$jsonTemplateFiles | ForEach-Object {
30+
$null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
31+
32+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
33+
$jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
34+
}
35+
36+
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
3037

3138
$xlfFiles = @()
3239

@@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object {
4451
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
4552
}
4653

47-
$locFiles = $jsonFiles + $xlfFiles
54+
$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles
4855

4956
$locJson = @{
5057
Projects = @(

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20210421.1
3+
sourceIndexPackageVersion: 1.0.1-20210614.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
77
binlogPath: artifacts/log/Debug/Build.binlog
88
pool:
99
vmImage: vs2017-win2016
10+
condition: ''
11+
dependsOn: ''
1012

1113
jobs:
1214
- job: SourceIndexStage1
15+
dependsOn: ${{ parameters.dependsOn }}
16+
condition: ${{ parameters.condition }}
1317
variables:
1418
- name: SourceIndexPackageVersion
1519
value: ${{ parameters.sourceIndexPackageVersion }}

‎eng/common/tools.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
378378
}
379379

380380
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
381-
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
381+
382+
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
383+
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
384+
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
385+
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
386+
} else {
387+
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
388+
}
389+
390+
return $global:_MSBuildExe
382391
}
383392

384393
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.22.10",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21355.2",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21355.2"
3535
}
3636
}

0 commit comments

Comments
 (0)