Skip to content

Commit b1b06e0

Browse files
Copilotbartelink
andcommitted
Revert PackageValidation changes and downgrade tests to net9.0
- Reverted all PackageValidation SDK removal and EnablePackageValidation changes per @bartelink feedback - Changed test projects from net10.0 to net9.0 to attempt compatibility with TypeShape 10.0.0 - PackageValidation changes will be moved to separate PR - BadImageFormatException persists in net9.0, root cause is TypeShape 10.0.0 32-bit DLLs incompatible with x64 test runner Co-authored-by: bartelink <206668+bartelink@users.noreply.github.com>
1 parent e4d4670 commit b1b06e0

8 files changed

Lines changed: 10 additions & 20 deletions

File tree

dotnet-tools.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/FsCodec.Box/FsCodec.Box.fsproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Sdk Name="Microsoft.DotNet.PackageValidation" Version="1.0.0-preview.7.21379.12" />
4+
35
<PropertyGroup>
46
<TargetFramework>netstandard2.1</TargetFramework>
5-
<EnablePackageValidation>true</EnablePackageValidation>
67
<PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
78
</PropertyGroup>
89

src/FsCodec.NewtonsoftJson/FsCodec.NewtonsoftJson.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Sdk Name="Microsoft.DotNet.PackageValidation" Version="1.0.0-preview.7.21379.12" />
34
<PropertyGroup>
45
<TargetFramework>netstandard2.1</TargetFramework>
5-
<EnablePackageValidation>true</EnablePackageValidation>
66
<PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
77
</PropertyGroup>
88

src/FsCodec.SystemTextJson/FsCodec.SystemTextJson.fsproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Sdk Name="Microsoft.DotNet.PackageValidation" Version="1.0.0-preview.7.21379.12" />
4+
35
<PropertyGroup>
46
<TargetFramework>netstandard2.1</TargetFramework>
5-
<EnablePackageValidation>true</EnablePackageValidation>
67
<PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
78
</PropertyGroup>
89

src/FsCodec/FsCodec.fsproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Sdk Name="Microsoft.DotNet.PackageValidation" Version="1.0.0-preview.7.21379.12" />
4+
35
<PropertyGroup>
46
<TargetFramework>netstandard2.1</TargetFramework>
57
<!-- Supress complaints we dropped netstandard2.0 in v 3.1 -->
68
<NoWarn>PKV006</NoWarn>
7-
<EnablePackageValidation>true</EnablePackageValidation>
89
<PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
910
</PropertyGroup>
1011

tests/FsCodec.NewtonsoftJson.Tests/FsCodec.NewtonsoftJson.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<DisableImplicitFSharpCoreReference>false</DisableImplicitFSharpCoreReference>
77
</PropertyGroup>

tests/FsCodec.SystemTextJson.Tests/FsCodec.SystemTextJson.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<DisableImplicitFSharpCoreReference>false</DisableImplicitFSharpCoreReference>
77
<DefineConstants>SYSTEM_TEXT_JSON</DefineConstants>

tests/FsCodec.Tests/FsCodec.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<DisableImplicitFSharpCoreReference>false</DisableImplicitFSharpCoreReference>
77
</PropertyGroup>

0 commit comments

Comments
 (0)