mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' into darc-main-817315bd-ca8d-4e8e-9a2e-b14bfc73bc22

Browse source
This commit is contained in:
Larry Ewing 2023-05-04 09:52:22 -05:00 committed by GitHub
commit aceb54a225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<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>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23253.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23251.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23253.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>2eb51fd1ec260129f623e0f01abd7752b56f5513</Sha>
<Sha>c65b02aef21850de618d37a5304d3bbd829c2733</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23253.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

3
eng/common/tools.ps1
View file

@ -399,7 +399,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# Locate Visual Studio installation or download x-copy msbuild.
$vsInfo = LocateVisualStudio $vsRequirements
if ($vsInfo -ne $null) {
$vsInstallDir = $vsInfo.installationPath
# Ensure vsInstallDir has a trailing slash
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23253.3"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.5",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23253.5"
}
}

4
src/SourceBuild/content/repo-projects/aspnetcore.proj
View file

@ -26,9 +26,11 @@
<!-- CA1512 - Use 'ArgumentOutOfRangeException.ThrowIfEqual'
Requires https://github.com/dotnet/aspnetcore/issues/47673 -->
<!-- CA1854 - Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
https://github.com/dotnet/aspnetcore/issues/48052 -->
<!-- IDE0005 - Using directive is unnecessary: https://github.com/dotnet/aspnetcore/issues/47932 -->
<!-- IDE0059 - Unnecessary assignment of a value: https://github.com/dotnet/aspnetcore/pull/47931 -->
<RepoNoWarns>CA1512;IDE0005;IDE0059</RepoNoWarns>
<RepoNoWarns>CA1512;CA1854;IDE0005;IDE0059</RepoNoWarns>
</PropertyGroup>
<ItemGroup>