[main] Update dependencies from dotnet/sdk (#18206)
[main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.24060.1 to 9.0.0-alpha.1.24060.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.24060.1 to 9.0.0-alpha.1.24060.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.24060.1 to 9.0.0-alpha.1.24060.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.24059.17 to 9.0.0-alpha.1.24060.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.24060.1 to 9.0.0-alpha.1.24060.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.24060.1 to 9.0.0-alpha.1.24060.2 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.8.200-beta.24055.2 to 12.8.200-beta.24060.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.24055.2 to 8.0.200-beta.24060.2 (parent: Microsoft.NET.Sdk) - Rebaseline fsharp patch
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
0b82a5aa64
commit
f78f0b4d76
3 changed files with 87 additions and 83 deletions
|
|
@ -5,21 +5,21 @@
|
|||
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
|
||||
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
|
||||
-->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-alpha.1.24060.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-alpha.1.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4ec0ed9971f8974889e71c55a60c3876b8b67a61</Sha>
|
||||
<Sha>1bdafaacbc6081b8d51c2945520fd6b534c32a5f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24060.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4ec0ed9971f8974889e71c55a60c3876b8b67a61</Sha>
|
||||
<Sha>1bdafaacbc6081b8d51c2945520fd6b534c32a5f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24060.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4ec0ed9971f8974889e71c55a60c3876b8b67a61</Sha>
|
||||
<Sha>1bdafaacbc6081b8d51c2945520fd6b534c32a5f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.24060.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4ec0ed9971f8974889e71c55a60c3876b8b67a61</Sha>
|
||||
<Sha>1bdafaacbc6081b8d51c2945520fd6b534c32a5f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24060.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
@ -52,51 +52,51 @@
|
|||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e0ecb3a6af984e12f2ba67e63bf9eff9f09de47c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.24059.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>c53f7e474ba80124fb9134ebf23d1d626a19b458</Sha>
|
||||
<Sha>6cfc445cba47c73001ff6d1b7599df3d2906d880</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.24060.11">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.24060.22">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>4ee2ed3de45a4cae2571cabac89ea307230c3cce</Sha>
|
||||
<Sha>676cc4a9a8428441cfe3e7935fd70e30c9c6ae57</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.24060.11">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.24060.22">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>4ee2ed3de45a4cae2571cabac89ea307230c3cce</Sha>
|
||||
<Sha>676cc4a9a8428441cfe3e7935fd70e30c9c6ae57</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.24060.11">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.24060.22">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>4ee2ed3de45a4cae2571cabac89ea307230c3cce</Sha>
|
||||
<Sha>676cc4a9a8428441cfe3e7935fd70e30c9c6ae57</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.24060.11">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.24060.22">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>4ee2ed3de45a4cae2571cabac89ea307230c3cce</Sha>
|
||||
<Sha>676cc4a9a8428441cfe3e7935fd70e30c9c6ae57</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>
|
||||
|
|
@ -132,13 +132,13 @@
|
|||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>d1793bf46d221789df9bf3bcde00cba11690c868</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.200-beta.24055.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.200-beta.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>cc741852156e5f048e4e046061fa36477f8b92fb</Sha>
|
||||
<Sha>465f1c07f0ed13e05c1c584821037b48bea230c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.200-beta.24055.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.200-beta.24060.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>cc741852156e5f048e4e046061fa36477f8b92fb</Sha>
|
||||
<Sha>465f1c07f0ed13e05c1c584821037b48bea230c7</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24059-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -73,22 +73,22 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24059.17</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.24059.17</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.24059.17</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24059.17</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.24059.17</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.24059.17</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.24059.17</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24060.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.24060.3</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.24060.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24060.3</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.24060.3</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.24060.3</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.24060.3</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.24060.11</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.24060.11</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.24060.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.24060.22</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.24060.22</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.24060.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -112,10 +112,10 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24060.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-alpha.1.24060.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24060.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.24060.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24060.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-alpha.1.24060.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24060.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.24060.2</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Backport: https://github.com/dotnet/source-build/issues/3663
|
|||
.../FSharp.Build.UnitTests.fsproj | 4 +--
|
||||
.../FSharp.Compiler.ComponentTests.fsproj | 4 +--
|
||||
...ompiler.Private.Scripting.UnitTests.fsproj | 4 +--
|
||||
.../FSharp.Compiler.Service.Tests.fsproj | 4 +--
|
||||
.../FSharp.Compiler.Service.Tests.fsproj | 9 ++++++
|
||||
.../FSharp.Compiler.UnitTests.fsproj | 4 +--
|
||||
.../FSharp.Core.UnitTests.fsproj | 4 +--
|
||||
.../FSharp.Test.Utilities.fsproj | 4 +--
|
||||
|
|
@ -35,13 +35,13 @@ Backport: https://github.com/dotnet/source-build/issues/3663
|
|||
.../HistoricalBenchmark.Runner.fsproj | 2 +-
|
||||
.../HistoricalBenchmark.fsproj | 2 +-
|
||||
.../FSharp.Compiler.Benchmarks.fsproj | 2 +-
|
||||
.../FCSSourceFiles/FCSSourceFiles.fsproj | 2 +-
|
||||
.../FCSSourceFiles/FCSSourceFiles.fsproj | 1 +
|
||||
.../Fsharp.ProfilingStartpointProject.fsproj | 2 +-
|
||||
tests/fsharp/FSharpSuite.Tests.fsproj | 4 +--
|
||||
.../Sample_ConsoleApp_net7.fsproj | 6 ++--
|
||||
.../Sample_ConsoleApp_net7.fsproj | 6 ++--
|
||||
.../LocalCompilerAndFslib.fsproj | 6 ++--
|
||||
36 files changed, 76 insertions(+), 76 deletions(-)
|
||||
36 files changed, 83 insertions(+), 73 deletions(-)
|
||||
|
||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
||||
index 879bd8941..161d115ad 100644
|
||||
|
|
@ -171,7 +171,7 @@ index 687bc2692..bcd71892c 100644
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
|
||||
index f7560b707..68b02ce25 100644
|
||||
index a427f7006..1f4968a2b 100644
|
||||
--- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
|
||||
+++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
|
||||
@@ -3,7 +3,7 @@
|
||||
|
|
@ -288,7 +288,7 @@ index dd17f8bd5..6bfa01c3e 100644
|
|||
</PropertyGroup>
|
||||
|
||||
diff --git a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
|
||||
index cb02b7e0f..acd4e8f10 100644
|
||||
index 90842baa5..eb14a3b02 100644
|
||||
--- a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
|
||||
+++ b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
|
@ -299,8 +299,8 @@ index cb02b7e0f..acd4e8f10 100644
|
|||
+ <TargetFrameworks>net9.0</TargetFrameworks>
|
||||
<LangVersion>preview</LangVersion>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<DotNetBuildOffline>true</DotNetBuildOffline>
|
||||
@@ -17,8 +17,8 @@
|
||||
</PropertyGroup>
|
||||
@@ -16,8 +16,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -312,7 +312,7 @@ index cb02b7e0f..acd4e8f10 100644
|
|||
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
|
||||
</PropertyGroup>
|
||||
diff --git a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
|
||||
index d36faf2c0..2004fafbe 100644
|
||||
index 7fd0dc709..445050022 100644
|
||||
--- a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
|
||||
+++ b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
|
@ -323,8 +323,8 @@ index d36faf2c0..2004fafbe 100644
|
|||
+ <TargetFrameworks>net9.0</TargetFrameworks>
|
||||
<LangVersion>preview</LangVersion>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<DotNetBuildOffline>true</DotNetBuildOffline>
|
||||
@@ -19,8 +19,8 @@
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
@@ -18,8 +18,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -420,20 +420,25 @@ index cdfd467e5..2fdcffc90 100644
|
|||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
<UnitTestType>xunit</UnitTestType>
|
||||
diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
|
||||
index 2eb2e1d95..b4f215939 100644
|
||||
index 909402a2a..b1b1e85f3 100644
|
||||
--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
|
||||
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
<PropertyGroup>
|
||||
@@ -5,6 +5,15 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFrameworks>net472;net8.0</TargetFrameworks>
|
||||
- <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
|
||||
<TargetFrameworks>net472;net8.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
|
||||
+ <TargetFrameworks>net472;net9.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
|
||||
<!-- Workaround to get rid of:
|
||||
error NU1505: Duplicate 'PackageDownload' items found.
|
||||
Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
|
||||
+ <!-- Workaround to get rid of:
|
||||
+ error NU1505: Duplicate 'PackageDownload' items found.
|
||||
+ Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
|
||||
+ The duplicate 'PackageDownload' items are:
|
||||
+ Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2].
|
||||
+ -->
|
||||
+ <NoWarn>$(NoWarn);NU1505</NoWarn>
|
||||
<NoWarn>$(NoWarn);44;75;</NoWarn>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<GenerateProgramFile>false</GenerateProgramFile>
|
||||
diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
|
||||
index 915332ac4..b0064bd9d 100644
|
||||
--- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
|
||||
|
|
@ -493,7 +498,7 @@ index 96ac25da8..fa08000dc 100644
|
|||
<LangVersion>8.0</LangVersion>
|
||||
</PropertyGroup>
|
||||
diff --git a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
|
||||
index 81866aa56..046bebf83 100644
|
||||
index 919c4cc07..b974b0bc6 100644
|
||||
--- a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
|
||||
+++ b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
|
||||
@@ -1,6 +1,6 @@
|
||||
|
|
@ -502,10 +507,10 @@ index 81866aa56..046bebf83 100644
|
|||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>net9.0</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<!-- Workaround to get rid of:
|
||||
error NU1505: Duplicate 'PackageDownload' items found.
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
<!-- Turn off "This function is for use by compiled F# code and should not be used directly" -->
|
||||
diff --git a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
|
||||
index 4d29d42c5..5c89a5fff 100644
|
||||
index 9706167ff..e02746a8e 100644
|
||||
--- a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
|
||||
+++ b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
@ -515,8 +520,8 @@ index 4d29d42c5..5c89a5fff 100644
|
|||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>net9.0</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<!-- Workaround to get rid of:
|
||||
error NU1505: Duplicate 'PackageDownload' items found.
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
<!-- Turn off "This function is for use by compiled F# code and should not be used directly" -->
|
||||
diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
|
||||
index 13add7032..4bbae272f 100644
|
||||
--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
|
||||
|
|
@ -531,7 +536,7 @@ index 13add7032..4bbae272f 100644
|
|||
<RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
|
||||
</PropertyGroup>
|
||||
diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
|
||||
index a477f61af..7b030bbd0 100644
|
||||
index 2534ba292..feef2eaf7 100644
|
||||
--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
|
||||
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
|
@ -542,9 +547,9 @@ index a477f61af..7b030bbd0 100644
|
|||
+ <TargetFramework>net9.0</TargetFramework>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
<Configurations>Release</Configurations>
|
||||
<!-- Workaround to get rid of:
|
||||
</PropertyGroup>
|
||||
diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
|
||||
index a8c8ff31b..d5c54252f 100644
|
||||
index 19c7f7a7e..10e1ff2f3 100644
|
||||
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
|
||||
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
|
@ -554,17 +559,16 @@ index a8c8ff31b..d5c54252f 100644
|
|||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>net9.0</TargetFramework>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
<!-- Workaround to get rid of:
|
||||
error NU1505: Duplicate 'PackageDownload' items found.
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
</PropertyGroup>
|
||||
diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
|
||||
index 5f0d38af2..ef367627e 100644
|
||||
index 3774aa870..988ccb579 100644
|
||||
--- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
|
||||
+++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
@@ -4,6 +4,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <TargetFramework>net9.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue