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

[main] Update dependencies from dotnet/sdk (#16608)

Browse source
This commit is contained in:
annie 2023-06-07 10:06:23 -07:00 • committed by GitHub
commit 9f5d4b84f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

92
eng/Version.Details.xml
View file

@ -17,30 +17,30 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha> <Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" /> <SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -48,38 +48,38 @@
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha> <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha> <Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
@ -102,22 +102,22 @@
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>98b55256c6cdfc0ed98c52d7d39127fa55971330</Sha> <Sha>98b55256c6cdfc0ed98c52d7d39127fa55971330</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23305.4"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23307.9">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>77f5be14af1b1d0e440e297d82b091ca854e3988</Sha> <Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23305.4"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23307.9">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>77f5be14af1b1d0e440e297d82b091ca854e3988</Sha> <Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23305.4"> <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23307.9">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>77f5be14af1b1d0e440e297d82b091ca854e3988</Sha> <Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23305.4"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23307.9">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>77f5be14af1b1d0e440e297d82b091ca854e3988</Sha> <Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.6.23303.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.6.23303.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -128,13 +128,13 @@
<Uri>https://github.com/dotnet/wpf</Uri> <Uri>https://github.com/dotnet/wpf</Uri>
<Sha>644cb9355a14e39f8beb694ddc56daf46b2bcaec</Sha> <Sha>644cb9355a14e39f8beb694ddc56daf46b2bcaec</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23302.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23305.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>5173fe8ebce324afd5f9197beb8787b97be7660b</Sha> <Sha>b265c68604681242d3a83db3f0f7b1bb97db4b93</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23302.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23305.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>5173fe8ebce324afd5f9197beb8787b97be7660b</Sha> <Sha>b265c68604681242d3a83db3f0f7b1bb97db4b93</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" /> <SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23302.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23302.1" CoherentParentDependency="Microsoft.NET.Sdk">
@ -142,18 +142,18 @@
<Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha> <Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" /> <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23304.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha> <Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23303.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23306.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a08e9e1f8fb99e332fd3254a4268466e590ce57a</Sha> <Sha>826e1770eedb6d8d44a054c9e3ea6569e7ec5970</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23302-06" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Build" Version="17.7.0-preview-23306-05" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>9604d20e7b556ca53a519a82680d131c2aa71bc6</Sha> <Sha>53a92930247b9bd023a24b57f778dfe9a969b693</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" /> <SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.51" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.51" CoherentParentDependency="Microsoft.NET.Sdk">

36
eng/Versions.props
View file

@ -68,42 +68,42 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23302.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23302.1</MicrosoftAspNetCoreAppRefPackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23302.1</MicrosoftAspNetCoreAppRefInternalPackageVersion> <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23302.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion> <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23302.1</dotnetdevcertsPackageVersion> <dotnetdevcertsPackageVersion>8.0.0-preview.6.23307.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23302.1</dotnetuserjwtsPackageVersion> <dotnetuserjwtsPackageVersion>8.0.0-preview.6.23307.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23302.1</dotnetusersecretsPackageVersion> <dotnetusersecretsPackageVersion>8.0.0-preview.6.23307.1</dotnetusersecretsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23305.4</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23307.9</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23305.4</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23307.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23305.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23307.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn --> <!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23303.1</MicrosoftNetCompilersToolsetPackageVersion> <MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23306.1</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx --> <!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23304.2</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup --> <!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23304.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23306.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23304.2</VSRedistCommonNetCoreTargetingPackx6480PackageVersion> <VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23306.10</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23304.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23304.2</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23304.2</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23304.2</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

39
src/SourceBuild/patches/razor/0001-During-source-build-target-net8.0-only.patch
View file

@ -1,39 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 30 May 2023 21:33:38 +0000
Subject: [PATCH] During source build, target net8.0 only
Backport: https://github.com/dotnet/razor/pull/8779
---
eng/SourceBuildPrebuiltBaseline.xml | 6 ------
eng/Versions.props | 1 +
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 90c84d161..347c42641 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,11 +1,5 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
-
- <!-- Ignoring the following prebuilts. net7.0 targeting is still needed
- due to https://github.com/dotnet/razor/issues/8293#issuecomment-1454042002
- net7.0 targeting removal is tracked in https://github.com/dotnet/razor/issues/8531 -->
- <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.2" />
- <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.2" />
</IgnorePatterns>
</UsageData>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d8d748ec..96d62879c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,6 +27,7 @@
<DefaultNetFxTargetFramework>net472</DefaultNetFxTargetFramework>
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework);net7.0</DefaultNetCoreTargetFrameworks>
+ <DefaultNetCoreTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
<DefaultNetCoreWindowsTargetFrameworks>net8.0-windows;net7.0-windows</DefaultNetCoreWindowsTargetFrameworks>
</PropertyGroup>
<!--