tsai
/
tye
mirror of https://github.com/dotnet/tye.git
1
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20220623.2 (#1421) 

[main] Update dependencies from dotnet/arcade
pull/1273/merge
dotnet-maestro[bot] 4 years ago
committed by GitHub
parent
966bfd6212
commit
0889b35168
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      eng/Version.Details.xml
  2. 2
      eng/common/tools.ps1
  3. 2
      eng/common/tools.sh
  4. 2
      global.json

20
eng/Version.Details.xml
View File

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22322.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22323.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha> <Sha>9dbd4ef3347980e68875996239f3272efb85dd04</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22322.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22323.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha> <Sha>9dbd4ef3347980e68875996239f3272efb85dd04</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22322.3"> <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22323.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha> <Sha>9dbd4ef3347980e68875996239f3272efb85dd04</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22322.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22323.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha> <Sha>9dbd4ef3347980e68875996239f3272efb85dd04</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22322.3"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22323.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha> <Sha>9dbd4ef3347980e68875996239f3272efb85dd04</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/common/tools.ps1
View File

@ -573,7 +573,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1 ExitWithExitCode 1
} }
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' } $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
} elseif ($msbuildEngine -eq "vs") { } elseif ($msbuildEngine -eq "vs") {
try { try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore $msbuildPath = InitializeVisualStudioMSBuild -install:$restore

2
eng/common/tools.sh
View File

@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values # return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild" _InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="netcoreapp3.1" _InitializeBuildToolFramework="net7.0"
} }
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

2
global.json
View File

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3" "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22323.2"
} }
} }

Write Preview
Loading…
Cancel
Save