diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-06-05 06:10:29 +0300 |
---|---|---|
committer | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-06-05 06:10:29 +0300 |
commit | 5eefc133d4ecb26ca32528fae658fff60dab5643 (patch) | |
tree | dd7dad2d3805d3c5365a818766e5a1fd8c083a1c | |
parent | 7104a315ba1e643b7f3df947b6511dd9462bf2e7 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20220526.1darc-objwriter/12.x-3a3948d1-a9d9-4b77-94f7-819e144b23ba
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
From Version 7.0.0-beta.22255.2 -> To Version 7.0.0-beta.22276.1
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | eng/common/init-tools-native.ps1 | 11 | ||||
-rw-r--r-- | eng/common/internal/Tools.csproj | 3 | ||||
-rw-r--r-- | eng/common/tools.ps1 | 4 | ||||
-rw-r--r-- | global.json | 4 |
6 files changed, 22 insertions, 14 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a934f98a9ae..bb5d79f3a200 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22255.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22276.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha> + <Sha>b8b67b243ba93bf9b89390c85b4dee034d3c5609</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22255.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22276.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha> + <Sha>b8b67b243ba93bf9b89390c85b4dee034d3c5609</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22255.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22276.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha> + <Sha>b8b67b243ba93bf9b89390c85b4dee034d3c5609</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 517682d2dc6b..182056d48332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22276.1</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 413adea4365b..24a5e65de1b3 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -93,7 +93,7 @@ try { $ToolVersion = "" } $ArcadeToolsDirectory = "C:\arcade-tools" - if (Test-Path $ArcadeToolsDirectory -eq $False) { + if (-not (Test-Path $ArcadeToolsDirectory)) { Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." exit 1 } @@ -103,13 +103,14 @@ try { exit 1 } $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" - if (Test-Path -Path "$BinPathFile" -eq $False) { + if (-not (Test-Path -Path "$BinPathFile")) { Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." exit 1 } $BinPath = Get-Content "$BinPathFile" - Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..." - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" } } exit 0 @@ -188,7 +189,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648ea1..7f5ce6d60813 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ <ItemGroup> <!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following --> <PackageReference Remove="@(PackageReference)"/> + <PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" /> + <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" /> + <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" /> <PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" /> <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/> </ItemGroup> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 797f05292a85..423bd962e966 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if (Test-Path variable:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index c112d2437217..6eddba545be4 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "7.0.100-preview.2.22153.17" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22276.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22276.1", "Microsoft.Build.Traversal": "2.0.2" } } |