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

Merge branch 'main' into mac-vmr

Browse source
This commit is contained in:
Jo Shields 2023-12-14 09:28:36 -05:00 • committed by GitHub
commit 085939a609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

64
eng/Version.Details.xml
View file

@ -52,51 +52,51 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ab1a8224cdf115b65e0db5dc88d11f205068f444</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.23612.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.23612.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>459a4884bf3ccd1f50ada2244a6c2da6a939ae0d</Sha>
<Sha>15194b0a34157cdaf7c0e6e0813929aff2356986</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.23613.1">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.23613.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ad1cd1de740d3332af31bd57afef0070b7a3329</Sha>
<Sha>bc9da06d9512a3db932bf638cab8f8e3f5b5aea9</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.23613.1">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.23613.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ad1cd1de740d3332af31bd57afef0070b7a3329</Sha>
<Sha>bc9da06d9512a3db932bf638cab8f8e3f5b5aea9</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.23613.1">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.23613.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ad1cd1de740d3332af31bd57afef0070b7a3329</Sha>
<Sha>bc9da06d9512a3db932bf638cab8f8e3f5b5aea9</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.23613.1">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.23613.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ad1cd1de740d3332af31bd57afef0070b7a3329</Sha>
<Sha>bc9da06d9512a3db932bf638cab8f8e3f5b5aea9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -211,18 +211,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23611.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23612.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23611.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23612.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23611.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23612.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,9 +232,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23611.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23612.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -245,9 +245,9 @@
<Sha>229464299759d6667e8b907d9c321d31a8dcc123</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="8.0.0-preview.23424.2">
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.23613.1">
<Uri>https://github.com/dotnet/scenario-tests</Uri>
<Sha>8af694a5e3986a27ccfee1a638ba311c7e9bc55d</Sha>
<Sha>0589a90cb11bb1daf9c05f20c1dc2d78c49075f2</Sha>
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

24
eng/Versions.props
View file

@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23612.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
@ -73,22 +73,22 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23612.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23612.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.23612.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23612.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.23612.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.23612.4</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.23612.4</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23612.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23612.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.23612.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23612.5</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.23612.5</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.23612.5</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.23612.5</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23613.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.23613.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.23613.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23613.6</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.23613.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.23613.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -248,7 +248,7 @@
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.9.0-preview-23610-02</MicrosoftNETTestSdkVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>8.0.0-preview.23424.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.23613.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->
<PropertyGroup>

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23611.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2"
}
}

3
src/SourceBuild/content/repo-projects/Directory.Build.props
View file

@ -119,9 +119,6 @@
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
<!-- https://github.com/dotnet/source-build/issues/3081 -->
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup>
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">

1
src/SourceBuild/content/repo-projects/msbuild.proj
View file

@ -10,7 +10,6 @@
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(OutputVersionArgs)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir)</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
</PropertyGroup>