Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade .NET SDK to 8.0.201. #978

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
strategy:
fail-fast: false
matrix:
dotnet: [ '3.1.x' ]
dotnet: [ '8.0.x' ]
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand Down
9 changes: 4 additions & 5 deletions csharp/sbe-benchmarks/sbe-benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Org.SbeTool.Sbe.Benchmarks</RootNamespace>
<AssemblyName>sbe-benchmarks</AssemblyName>
<OutputTypeEx>exe</OutputTypeEx>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014-2024. All rights reserved.</Copyright>
<Product>SBE</Product>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand All @@ -16,9 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.12.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.12" />
</ItemGroup>

</Project>
8 changes: 2 additions & 6 deletions csharp/sbe-dll/sbe-dll.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyName>SBE</AssemblyName>
<RootNamespace>Org.SbeTool.Sbe.Dll</RootNamespace>
<Product>Org.SbeTool.Sbe.Dll</Product>
<Copyright>Copyright (C) Bill Segall 2018-2021, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018-2021, MarketFactory Inc 2017, Adaptive 2014-2024. All rights reserved.</Copyright>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Bill Segall, MarketFactory Inc, Adaptive Consulting</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down Expand Up @@ -37,10 +37,6 @@
</None>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Runtime" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<PackageReference Include="System.Memory" Version="4.5.3" />
Expand Down
13 changes: 5 additions & 8 deletions csharp/sbe-generated/sbe-generated.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Org.SbeTool.Sbe.Generated</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Generated</AssemblyName>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014-2024. All rights reserved.</Copyright>
<LangVersion>9</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>TRACE,SBE_ENABLE_PRECEDENCE_CHECKS</DefineConstants>
<DefineConstants>TRACE;SBE_ENABLE_PRECEDENCE_CHECKS</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>TRACE,SBE_ENABLE_PRECEDENCE_CHECKS</DefineConstants>
<DefineConstants>TRACE;SBE_ENABLE_PRECEDENCE_CHECKS</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\sbe-dll\sbe-dll.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
</ItemGroup>

</Project>
6 changes: 1 addition & 5 deletions csharp/sbe-samples-car/sbe-samples-car.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<OutputType>exe</OutputType>
<RootNamespace>Org.SbeTool.Sbe.Example.Car</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Example.Car</AssemblyName>
Expand All @@ -16,8 +16,4 @@
<ProjectReference Include="..\sbe-generated\sbe-generated.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
</ItemGroup>

</Project>
9 changes: 2 additions & 7 deletions csharp/sbe-samples-extension/sbe-samples-extension.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<OutputTypeEx>exe</OutputTypeEx>
<RootNamespace>Org.SbeTool.Sbe.Example.Extension</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Example.Extension</AssemblyName>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014-2024. All rights reserved.</Copyright>
</PropertyGroup>

<ItemGroup>
Expand All @@ -17,9 +17,4 @@
<ProjectReference Include="..\sbe-generated\sbe-generated.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />

</ItemGroup>

</Project>
11 changes: 5 additions & 6 deletions csharp/sbe-tests/sbe-tests.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Org.SbeTool.Sbe.Tests</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.UnitTests</AssemblyName>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014-2024. All rights reserved.</Copyright>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,10 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>

</Project>