未验证 提交 b2e8c7a1 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

Update dependencies from https://github.com/dotnet/arcade build 20230503.5 (#7795)

[main] Update dependencies from dotnet/arcade
上级 df31f3aa
...@@ -156,25 +156,25 @@ ...@@ -156,25 +156,25 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha> <Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23253.3"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha> <Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23253.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha> <Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.23253.3"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha> <Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23253.3"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha> <Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade --> <!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.23253.3</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>8.0.0-beta.23253.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetCodeAnalysisPackageVersion> <MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.23253.5</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 --> <!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 --> <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
......
...@@ -399,7 +399,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = ...@@ -399,7 +399,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# Locate Visual Studio installation or download x-copy msbuild. # Locate Visual Studio installation or download x-copy msbuild.
$vsInfo = LocateVisualStudio $vsRequirements $vsInfo = LocateVisualStudio $vsRequirements
if ($vsInfo -ne $null) { if ($vsInfo -ne $null) {
$vsInstallDir = $vsInfo.installationPath # Ensure vsInstallDir has a trailing slash
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3", "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23253.3" "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23253.5"
}, },
"sdk": { "sdk": {
"version": "8.0.100-preview.3.23178.7" "version": "8.0.100-preview.3.23178.7"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册