Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '10.0.x'

# Perform the dotnet actions
- name: Restore
Expand Down Expand Up @@ -92,6 +96,8 @@ jobs:
run: dotnet test --no-build --configuration Release --framework net6.0
- name: Test (net8.0)
run: dotnet test --no-build --configuration Release --framework net8.0
- name: Test (net10.0)
run: dotnet test --no-build --configuration Release --framework net10.0

test-windows:
name: Test (Windows)
Expand All @@ -112,6 +118,10 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '10.0.x'

- name: Restore
run: dotnet restore
Expand All @@ -138,10 +148,10 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 8.0
- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Restore
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.ArcGIS/Geo.ArcGIS.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET ArcGIS</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.Bing/Geo.Bing.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET Bing</Product>
Expand Down
11 changes: 9 additions & 2 deletions src/Geo.Core/Geo.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET Core</Product>
Expand All @@ -16,6 +16,13 @@
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="10.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
Expand All @@ -34,7 +41,7 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageReference Include="System.Text.Json" Version="4.7.2" />
<PackageReference Include="System.Text.Json" Version="4.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.Google/Geo.Google.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET Google</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.Here/Geo.Here.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET HERE</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.MapBox/Geo.MapBox.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET MapBox</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.MapQuest/Geo.MapQuest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET MapQuest</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.Positionstack/Geo.Positionstack.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET Positionstack</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Geo.Radar/Geo.Radar.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<Authors>Justin Canton</Authors>
<Company>Geo.NET</Company>
<Product>Geo.NET Radar</Product>
Expand Down
6 changes: 6 additions & 0 deletions src/Source.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<Project>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.ArcGIS.Tests/Geo.ArcGIS.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.Bing.Tests/Geo.Bing.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.Core.Tests/Geo.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.Google.Tests/Geo.Google.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.Here.Tests/Geo.Here.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.MapBox.Tests/Geo.MapBox.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.MapQuest.Tests/Geo.MapQuest.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Geo.Radar.Tests/Geo.Radar.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Loading