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

[release/7.0.4xx] Update dependencies from dotnet/sdk (#16274)

Browse source
This commit is contained in:
Noah Gilson 2023-05-10 10:45:46 -07:00 committed by GitHub
commit e668895f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
eng/Version.Details.xml
View file

@ -98,22 +98,22 @@
<Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23226.6">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23260.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>93e05de23ed16ea2cd4a3a0097090afb74638e3a</Sha>
<Sha>1a1bcd074b7cf71cce35edd2754d97b92a53d993</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23226.6">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23260.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>93e05de23ed16ea2cd4a3a0097090afb74638e3a</Sha>
<Sha>1a1bcd074b7cf71cce35edd2754d97b92a53d993</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23226.6">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23260.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>93e05de23ed16ea2cd4a3a0097090afb74638e3a</Sha>
<Sha>1a1bcd074b7cf71cce35edd2754d97b92a53d993</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23226.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23260.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>93e05de23ed16ea2cd4a3a0097090afb74638e3a</Sha>
<Sha>1a1bcd074b7cf71cce35edd2754d97b92a53d993</Sha>
</Dependency>
<!-- 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="7.0.5-servicing.23175.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -124,18 +124,18 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>03e9f99d0f93a3e3768227a9c6a1076fabd0de43</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23225.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.7.0-beta.23260.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1bbbdb332e8142776ae722f8933464249001ced6</Sha>
<Sha>dd9c7d9c3987ad625fdc47977a838cf98621c034</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23225.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23260.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1bbbdb332e8142776ae722f8933464249001ced6</Sha>
<Sha>dd9c7d9c3987ad625fdc47977a838cf98621c034</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23225.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23259.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>8e6424700be04bf5e9b9e0146407aa2470b86518</Sha>
<Sha>89412f796fc3d376b552b1631ad47246818857b9</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23211.1" CoherentParentDependency="Microsoft.NET.Sdk">
@ -144,23 +144,23 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.23225.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.23259.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>d2dc53dbb0c6c67f206a74aa4d323d11cb2e107d</Sha>
<Sha>7eeb7cecdd8b1fc9b45f5c61306a07e26d23ce3e</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23226-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23260-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>093fbaf7bcad53c1efc8b38ccadf42f4a5f803f4</Sha>
<Sha>7f4bef8b46b3ebc275219ec936837ebf9f32c148</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23226-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23260-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>093fbaf7bcad53c1efc8b38ccadf42f4a5f803f4</Sha>
<Sha>7f4bef8b46b3ebc275219ec936837ebf9f32c148</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.1.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.36" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f1757fe7a9a3e178562518f4535f71348a117010</Sha>
<Sha>886d4675d7d7c2c2100fb0fe99a62a0543c2431e</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">

8
eng/Versions.props
View file

@ -69,9 +69,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400-preview.23226.6</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.400-preview.23226.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23226.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400-preview.23260.6</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.400-preview.23260.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23260.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -193,7 +193,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.7.0-preview.23225.6</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.7.0-preview.23259.2</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>

6
src/redist/targets/Crossgen.targets
View file

@ -48,6 +48,7 @@
<WebTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\</WebTools>
<ProjectSystemTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\</ProjectSystemTools>
<WorkerTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Worker\tools\$(DefaultToolTfm)\</WorkerTools>
<ContainerTasks>$(SdkOutputDirectory)Containers\tasks\$(DefaultToolTfm)\</ContainerTasks>
</PropertyGroup>
<ItemGroup>
@ -68,6 +69,10 @@
<RemainingFiles Remove="$(SdkOutputDirectory)Sdks\**\*" />
<RemainingFiles Remove="$(SdkOutputDirectory)**\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
<!-- Removing Containers as containerize .DLLs and net472 components shouldn't be crossgenned. -->
<RemainingFiles Remove="$(SdkOutputDirectory)Containers\**\*" />
<!-- Add back the .NET Core assemblies in the Sdks folder -->
<RemainingFiles Include="$(NetSdkTools)**\*" />
<RemainingFiles Include="$(BlazorWasmTools)**\*" />
@ -79,6 +84,7 @@
<RemainingFiles Include="$(WebTools)**\*" />
<RemainingFiles Include="$(ProjectSystemTools)**\*" />
<RemainingFiles Include="$(WorkerTools)**\*" />
<RemainingFiles Include="$(ContainerTasks)**\*" />
<!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
<RemainingFiles Remove="$(SdkOutputDirectory)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />