Merge pull request #14100 from dotnet/darc-main-004b9fc9-8a00-48dc-8968-1e96c744fb5b
[main] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine
GitHub
commit
5bb3796211
6 changed files with 123 additions and 256 deletions
|
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-preview.7.22355.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>706393353488ce178488e8de342599414c29d8c7</Sha>
|
||||
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22355.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>706393353488ce178488e8de342599414c29d8c7</Sha>
|
||||
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-preview.7.22355.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>706393353488ce178488e8de342599414c29d8c7</Sha>
|
||||
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.7.22355.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>706393353488ce178488e8de342599414c29d8c7</Sha>
|
||||
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<!-- 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. -->
|
||||
|
|
@ -48,38 +48,38 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
|
||||
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22356.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5c3a312e6c8798efb62b9b5ccd0ea8620be11118</Sha>
|
||||
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22362.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -98,61 +98,61 @@
|
|||
<Sha>9c5549788cda5238a0e65466cbde9eb4ed42b695</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-preview.7.22329.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-preview.7.22361.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>0b9b0b4e7abc5d41b6308f91101981b0b21d90f2</Sha>
|
||||
<Sha>0bc8addffefdf3e521bd3bf422922fae4c28187d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-preview.7.22329.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-preview.7.22361.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>0b9b0b4e7abc5d41b6308f91101981b0b21d90f2</Sha>
|
||||
<Sha>0bc8addffefdf3e521bd3bf422922fae4c28187d</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.7.22358.1">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22362.27">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>3d459093b37956d9c28be26c0ea9bd181d5dd454</Sha>
|
||||
<Sha>c04bcc45ae3af08eac29be092b78880a87417747</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.7.22358.1">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22362.27">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>3d459093b37956d9c28be26c0ea9bd181d5dd454</Sha>
|
||||
<Sha>c04bcc45ae3af08eac29be092b78880a87417747</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.0-preview.7.22355.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>5972c29ef057fe95563646f2810735795c899a4f</Sha>
|
||||
<Sha>67bbe0551b46defdea8ddac62c8aab6130721ed7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-preview.7.22355.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>52db6defd3dc565232e29dc5eb8b8772bd06f175</Sha>
|
||||
<Sha>e76cb7b5c8f0769b0e57b0b0374b73155475dd18</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22361.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>702b8e77f5fbfe21e6743324c1750503e02f182d</Sha>
|
||||
<Sha>f224a8fa0a4dd2f8f150cfefe85b3c40f5c1bc29</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22361.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>702b8e77f5fbfe21e6743324c1750503e02f182d</Sha>
|
||||
<Sha>f224a8fa0a4dd2f8f150cfefe85b3c40f5c1bc29</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220702-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220711-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>b1452a516a80672fa814f4ebdf2151c0875d0b20</Sha>
|
||||
<Sha>b2e2126f1aa7e5753cafe9515563c99ade6a59ce</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22354.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22362.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>ef2d0f25b72469b55925251a79f12bcbf98644bf</Sha>
|
||||
<Sha>33a76b856466b96dd3d179e599a7fc0118389641</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-3.22355.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-1.22362.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>76aec58b9f6e82be2f7285c488dbb29554c625b1</Sha>
|
||||
<Sha>25f57fcf218db3a5c3dbca01531b099d7a50901e</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22330-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22358-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>94c28cca4cdb22f2cac279e3fd8d86aa4d061848</Sha>
|
||||
<Sha>62b690b290fdb75e2bf368dfcb52e84b411e88d2</Sha>
|
||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.3.0-rc.114" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -170,9 +170,9 @@
|
|||
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
|
||||
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22330.1" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22357.1" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>40e7c6226711ec616ee07e725563eda708630fe1</Sha>
|
||||
<Sha>860fa012fd4cfdb5808606e196e8aa548586f96f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview4.1.22206.3">
|
||||
<Uri>https://github.com/dotnet/deployment-tools</Uri>
|
||||
|
|
|
|||
|
|
@ -30,15 +30,15 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-preview.7.22355.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-preview.7.22357.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-preview.7.22355.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-preview.7.22357.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-preview.7.22329.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-preview.7.22361.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -52,45 +52,45 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22356.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22356.9</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22356.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22356.9</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22356.9</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22356.9</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22356.9</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22361.9</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22361.9</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22361.9</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22361.9</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-preview.7.22358.1</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.7.22358.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22362.27</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22362.27</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.6.22356.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.6.22356.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22358.7</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.7.22358.7</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22355.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-preview.7.22355.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-preview.7.22355.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-preview.7.22355.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22357.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-preview.7.22357.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-preview.7.22357.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-preview.7.22357.2</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220702-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220711-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
<XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
|
||||
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22330.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22357.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</EmscriptenWorkloadManifestVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Tue, 12 Jul 2022 13:50:55 -0700
|
||||
Subject: [PATCH] Revert "[Infrastructure] Update SDK version (#42571)"
|
||||
|
||||
Temporarily rollback https://github.com/dotnet/aspnetcore/pull/42571
|
||||
(aefef28a51afd41d358eb0573e10cd858dcdc3e3) because source-build is still using an older
|
||||
toolset. This will be addressed by @crummel in https://github.com/dotnet/installer/pull/14089.
|
||||
---
|
||||
src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
|
||||
index 63fc8668d6..5e18ba0861 100644
|
||||
--- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
|
||||
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
|
||||
@@ -313,7 +313,7 @@ public class HttpParser<TRequestHandler> : IHttpParser<TRequestHandler> where TR
|
||||
}
|
||||
|
||||
SequencePosition lineEnd;
|
||||
- scoped ReadOnlySpan<byte> headerSpan;
|
||||
+ ReadOnlySpan<byte> headerSpan;
|
||||
if (currentSlice.Slice(reader.Position, lineEndPosition.Value).Length == currentSlice.Length - 1)
|
||||
{
|
||||
// No enough data, so CRLF can't currently be there.
|
||||
@@ -321,8 +321,7 @@ public class HttpParser<TRequestHandler> : IHttpParser<TRequestHandler> where TR
|
||||
|
||||
// Advance 1 to include CR/LF in lineEnd
|
||||
lineEnd = currentSlice.GetPosition(1, lineEndPosition.Value);
|
||||
- var header = currentSlice.Slice(reader.Position, lineEnd);
|
||||
- headerSpan = header.IsSingleSegment ? header.FirstSpan : header.ToArray();
|
||||
+ headerSpan = currentSlice.Slice(reader.Position, lineEnd).ToSpan();
|
||||
if (headerSpan[^1] != ByteCR)
|
||||
{
|
||||
RejectRequestHeader(headerSpan);
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 3 May 2022 18:50:25 +0000
|
||||
Subject: [PATCH] Upgrade Microsoft.Win32.Registry reference to 5.0.0
|
||||
|
||||
Backport: https://github.com/dotnet/fsharp/pull/13091
|
||||
---
|
||||
eng/Versions.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index afefd9501..ff4d8ac89 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -208,7 +208,7 @@
|
||||
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
|
||||
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
|
||||
<MicrosoftNETTestSdkVersion>16.11.0</MicrosoftNETTestSdkVersion>
|
||||
- <MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
|
||||
+ <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
|
||||
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
|
||||
<NUnitVersion>3.13.2</NUnitVersion>
|
||||
<NUnit3TestAdapterVersion>4.1.0</NUnit3TestAdapterVersion>
|
||||
|
|
@ -1,145 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Ransom <codecutter@hotmail.com>
|
||||
Date: Thu, 2 Jun 2022 17:09:16 -0700
|
||||
Subject: [PATCH] fix 13174
|
||||
|
||||
Backport: https://github.com/dotnet/fsharp/pull/13239
|
||||
---
|
||||
eng/Build.ps1 | 4 ++-
|
||||
eng/SourceBuild.props | 2 +-
|
||||
src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +-
|
||||
.../Microsoft.FSharp.Compiler.csproj | 32 ++++++++++++++++++-
|
||||
src/fsharp/Microsoft.FSharp.Compiler/Program.cs | 2 +-
|
||||
.../VisualFSharp.Core.targets | 2 +-
|
||||
6 files changed, 38 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/eng/Build.ps1 b/eng/Build.ps1
|
||||
index 424cbe6c5..ce23ae7da 100644
|
||||
--- a/eng/Build.ps1
|
||||
+++ b/eng/Build.ps1
|
||||
@@ -61,6 +61,7 @@ param (
|
||||
[string]$officialSkipTests = "false",
|
||||
[switch]$noVisualStudio,
|
||||
[switch]$sourceBuild,
|
||||
+ [switch]$skipBuild,
|
||||
|
||||
[parameter(ValueFromRemainingArguments = $true)][string[]]$properties)
|
||||
|
||||
@@ -114,6 +115,7 @@ function Print-Usage() {
|
||||
Write-Host " -useGlobalNuGetCache Use global NuGet cache."
|
||||
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
|
||||
Write-Host " -sourceBuild Simulate building for source-build."
|
||||
+ Write-Host " -skipbuild Skip building product"
|
||||
Write-Host ""
|
||||
Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
|
||||
}
|
||||
@@ -458,7 +460,7 @@ try {
|
||||
}
|
||||
|
||||
$script:BuildMessage = "Failure building product"
|
||||
- if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) {
|
||||
+ if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild) {
|
||||
if ($noVisualStudio) {
|
||||
BuildSolution "FSharp.sln"
|
||||
}
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 903ee00d3..86c24c1b4 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -26,7 +26,7 @@
|
||||
-->
|
||||
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
|
||||
<PropertyGroup>
|
||||
- <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
|
||||
+ <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"</InnerBuildArgs>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
|
||||
index f293b92a0..b87e2def5 100644
|
||||
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
|
||||
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
|
||||
@@ -4,8 +4,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
- <TargetFramework Condition="'$(Configuration)' != 'Proto'">netstandard2.0</TargetFramework>
|
||||
- <TargetFrameworks Condition="'$(Configuration)' == 'Proto'">netstandard2.0</TargetFrameworks>
|
||||
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<AssemblyName>FSharp.Build</AssemblyName>
|
||||
<NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
|
||||
<AllowCrossTargeting>true</AllowCrossTargeting>
|
||||
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
index eaeac80f3..e078498d7 100644
|
||||
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
@@ -9,8 +9,12 @@
|
||||
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
|
||||
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
|
||||
<NoDefaultExcludes>true</NoDefaultExcludes>
|
||||
+ <ArcadeSdkDir Condition="'$(ArcadeSdkDir)' == ''">$(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\</ArcadeSdkDir>
|
||||
+ <_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets</_BuildReleasePackagesTargets>
|
||||
</PropertyGroup>
|
||||
|
||||
+ <Import Project="$(_BuildReleasePackagesTargets)" />
|
||||
+
|
||||
<ItemGroup>
|
||||
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
|
||||
<NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
|
||||
@@ -19,6 +23,33 @@
|
||||
<NuspecProperty Include="artifactsPackagesDir=$(ArtifactsPackagesDir)" />
|
||||
</ItemGroup>
|
||||
|
||||
- <Target Name="Build" />
|
||||
+ <ItemGroup>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj">
|
||||
+ <AdditionalProperties>TargetFrameworks=netstandard2.1;netstandard2.0</AdditionalProperties>
|
||||
+ </DependentProjects>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj">
|
||||
+ <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
|
||||
+ </DependentProjects>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
|
||||
+ <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
|
||||
+ </DependentProjects>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj">
|
||||
+ <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
|
||||
+ </DependentProjects>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
|
||||
+ <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
|
||||
+ </DependentProjects>
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\fsi\fsi.fsproj" />
|
||||
+ <DependentProjects Include="$(MSBuildThisFileDirectory)..\fsc\fsc.fsproj" />
|
||||
+ </ItemGroup>
|
||||
+
|
||||
+ <Target Name="PackDependentProjectsCore">
|
||||
+ <MSBuild Projects="@(DependentProjects)" Targets="Restore;Build;Pack" Properties="Restore=true;Pack=true;Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
|
||||
+ </Target>
|
||||
+
|
||||
+ <Target Name="PackDependentProjects"
|
||||
+ BeforeTargets="Build"
|
||||
+ DependsOnTargets="PackDependentProjectsCore;PackageReleasePackages">
|
||||
+ </Target>
|
||||
|
||||
</Project>
|
||||
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs
|
||||
index c52f10378..0be8ed50b 100644
|
||||
--- a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs
|
||||
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs
|
||||
@@ -1,2 +1,2 @@
|
||||
-// See https://aka.ms/new-console-template for more information
|
||||
+// See https://aka.ms/new-console-template for more information
|
||||
return 0;
|
||||
\ No newline at end of file
|
||||
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets
|
||||
index 966cffad5..9b932e87e 100644
|
||||
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets
|
||||
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets
|
||||
@@ -33,7 +33,7 @@
|
||||
<NgenArchitecture>All</NgenArchitecture>
|
||||
<NgenPriority>2</NgenPriority>
|
||||
<Private>True</Private>
|
||||
- <AdditionalProperties>TargetFramework=$(DependencyTargetFramework)</AdditionalProperties>
|
||||
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||||
</ProjectReference>
|
||||
|
||||
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
|
||||
|
|
@ -222,6 +222,6 @@ index fe90e93ca..01b64e055 100644
|
|||
<TargetFramework>net6.0</TargetFramework>
|
||||
<NonShipping>true</NonShipping>
|
||||
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue