Skip to content

Commit a0fbf9f

Browse files
TimmyMCTimmyMC
committed
Support only .NET 8+
1 parent 0a65a18 commit a0fbf9f

File tree

61 files changed

+501
-1351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+501
-1351
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,3 +523,5 @@ dotnet_naming_rule.parameters_rule.severity = warning
523523
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
524524
# OTHER DEALINGS IN THE SOFTWARE.
525525
##########################################
526+
527+
dotnet_style_require_accessibility_modifiers = for_non_interface_members

‎Benchmarks/Schema.NET.Benchmarks/Schema.NET.Benchmarks.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
<PropertyGroup Label="Build">
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net48</TargetFrameworks>
5+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
7-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
87
</PropertyGroup>
98

109
<ItemGroup Label="Project References">

‎Benchmarks/Schema.NET.Benchmarks/SchemaBenchmarkBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Schema.NET.Benchmarks;
1313
[CsvMeasurementsExporter]
1414
[RPlotExporter]
1515
[SimpleJob(RuntimeMoniker.Net80)]
16-
[SimpleJob(RuntimeMoniker.Net48)]
16+
[SimpleJob(RuntimeMoniker.Net10_0)]
1717
public abstract class SchemaBenchmarkBase
1818
{
1919
public Thing Thing { get; set; } = default!;

‎Benchmarks/Schema.NET.Benchmarks/packages.lock.json‎

Lines changed: 70 additions & 264 deletions
Large diffs are not rendered by default.

‎Directory.Build.props‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<Nullable>enable</Nullable>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
12-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1312
</PropertyGroup>
1413

1514
<PropertyGroup Label="Package">
@@ -26,9 +25,7 @@
2625
</PropertyGroup>
2726

2827
<ItemGroup Label="Package References">
29-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.12.19" />
30-
<PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
31-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" Version="8.0.0" />
28+
<PackageReference Include="MinVer" PrivateAssets="All" Version="6.0.0"/>
3229
</ItemGroup>
3330

3431
</Project>

‎Schema.NET.sln‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -83,42 +83,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
8383
EndProject
8484
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Schema.NET.Pending", "Source\Schema.NET.Pending\Schema.NET.Pending.csproj", "{4EDF33FF-4532-4328-A158-D026C66537BA}"
8585
EndProject
86-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{AF228B8A-7290-4E26-8506-934C290C6AE3}"
87-
ProjectSection(SolutionItems) = preProject
88-
Source\Common\Constants.cs = Source\Common\Constants.cs
89-
Source\Common\ContactType.cs = Source\Common\ContactType.cs
90-
Source\Common\ContextJsonConverter.cs = Source\Common\ContextJsonConverter.cs
91-
Source\Common\DateTimeHelper.cs = Source\Common\DateTimeHelper.cs
92-
Source\Common\DateTimeToIso8601DateValuesJsonConverter.cs = Source\Common\DateTimeToIso8601DateValuesJsonConverter.cs
93-
Source\Common\EnumHelper.cs = Source\Common\EnumHelper.cs
94-
Source\Common\FastActivator.cs = Source\Common\FastActivator.cs
95-
Source\Common\HashCode.cs = Source\Common\HashCode.cs
96-
Source\Common\IValues.cs = Source\Common\IValues.cs
97-
Source\Common\JsonLdContext.cs = Source\Common\JsonLdContext.cs
98-
Source\Common\JsonLdObject.cs = Source\Common\JsonLdObject.cs
99-
Source\Common\OneOrMany{T}.cs = Source\Common\OneOrMany{T}.cs
100-
Source\Common\PropertyValueSpecification.Partial.cs = Source\Common\PropertyValueSpecification.Partial.cs
101-
Source\Common\SchemaEnumJsonConverter{T}.cs = Source\Common\SchemaEnumJsonConverter{T}.cs
102-
Source\Common\SchemaSerializer.cs = Source\Common\SchemaSerializer.cs
103-
Source\Common\Thing.Partial.cs = Source\Common\Thing.Partial.cs
104-
Source\Common\TimeSpanToISO8601DurationValuesJsonConverter.cs = Source\Common\TimeSpanToISO8601DurationValuesJsonConverter.cs
105-
Source\Common\TypeExtensions.cs = Source\Common\TypeExtensions.cs
106-
Source\Common\ValuesJsonConverter.cs = Source\Common\ValuesJsonConverter.cs
107-
Source\Common\Values{T1,T2,T3,T4,T5,T6,T7}.cs = Source\Common\Values{T1,T2,T3,T4,T5,T6,T7}.cs
108-
Source\Common\Values{T1,T2,T3,T4,T5,T6}.cs = Source\Common\Values{T1,T2,T3,T4,T5,T6}.cs
109-
Source\Common\Values{T1,T2,T3,T4,T5}.cs = Source\Common\Values{T1,T2,T3,T4,T5}.cs
110-
Source\Common\Values{T1,T2,T3,T4}.cs = Source\Common\Values{T1,T2,T3,T4}.cs
111-
Source\Common\Values{T1,T2,T3}.cs = Source\Common\Values{T1,T2,T3}.cs
112-
Source\Common\Values{T1,T2}.cs = Source\Common\Values{T1,T2}.cs
113-
EndProjectSection
114-
EndProject
11586
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Schema.NET.Updater", "Tools\Schema.NET.Updater\Schema.NET.Updater.csproj", "{8923F9E2-4BB8-45F9-9A85-863F381B46EE}"
11687
EndProject
11788
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{A208CE34-D2DF-4BD2-B6CF-3047883BC820}"
11889
ProjectSection(SolutionItems) = preProject
11990
Data\schemaorg-all-https.jsonld = Data\schemaorg-all-https.jsonld
12091
EndProjectSection
12192
EndProject
93+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schema.NET.Common", "Source\Schema.NET.Common\Schema.NET.Common.csproj", "{E1CB91D3-896B-4E25-882F-5596C4435555}"
94+
EndProject
12295
Global
12396
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12497
Debug|Any CPU = Debug|Any CPU
@@ -149,6 +122,10 @@ Global
149122
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
150123
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
151124
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Release|Any CPU.Build.0 = Release|Any CPU
125+
{E1CB91D3-896B-4E25-882F-5596C4435555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126+
{E1CB91D3-896B-4E25-882F-5596C4435555}.Debug|Any CPU.Build.0 = Debug|Any CPU
127+
{E1CB91D3-896B-4E25-882F-5596C4435555}.Release|Any CPU.ActiveCfg = Release|Any CPU
128+
{E1CB91D3-896B-4E25-882F-5596C4435555}.Release|Any CPU.Build.0 = Release|Any CPU
152129
EndGlobalSection
153130
GlobalSection(SolutionProperties) = preSolution
154131
HideSolutionNode = FALSE
@@ -163,8 +140,8 @@ Global
163140
{040F8F6D-9144-42FD-9B0D-7F88EF0C26C5} = {F20E2797-D1E3-4321-91BB-FAE54954D2A0}
164141
{9444439E-8476-4BAB-AE1E-DBC24B58865F} = {040F8F6D-9144-42FD-9B0D-7F88EF0C26C5}
165142
{4EDF33FF-4532-4328-A158-D026C66537BA} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
166-
{AF228B8A-7290-4E26-8506-934C290C6AE3} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
167143
{8923F9E2-4BB8-45F9-9A85-863F381B46EE} = {1D81D082-9C25-4D4E-890E-9CD173532307}
144+
{E1CB91D3-896B-4E25-882F-5596C4435555} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
168145
EndGlobalSection
169146
GlobalSection(ExtensibilityGlobals) = postSolution
170147
SolutionGuid = {73F36209-F8D6-4066-8951-D97729F773CF}

‎Schema.NET.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MS/@EntryIndexedValue">MS</s:String></wpf:ResourceDictionary>

‎Source/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup Label="Package References">
19-
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="all" Version="1.1.1" />
19+
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="all" Version="1.2.39" />
2020
</ItemGroup>
2121

2222
<ItemGroup Label="Files">

Source/Common/Constants.cs renamed to Source/Schema.NET.Common/Constants.cs

File renamed without changes.

Source/Common/ContactType.cs renamed to Source/Schema.NET.Common/ContactType.cs

File renamed without changes.

0 commit comments

Comments
 (0)