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
17 changes: 9 additions & 8 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ on:
jobs:
pack:

runs-on: ubuntu-latest
# Needs to be 22.04 because this image includes mono installation
runs-on: ubuntu-22.04
services:
oracle:
image: gvenzl/oracle-xe:latest
image: gvenzl/oracle-free:latest
env:
ORACLE_PASSWORD: oracle

Expand All @@ -31,10 +32,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Setup .NET 6
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: 8

- name: Restore dependencies
run: dotnet restore
Expand Down Expand Up @@ -62,10 +63,10 @@ jobs:
if: github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')

steps:
- name: Setup .NET 6
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: 8

- name: Download Package Files
uses: actions/download-artifact@v4
Expand All @@ -87,10 +88,10 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'

steps:
- name: Setup .NET 6
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: 8

- name: Download Package Files
uses: actions/download-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions NetTopologySuite.IO.Oracle.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B0923F22-AF00-46DA-B5CE-73F4D398DE37}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
src\Directory.Build.props = src\Directory.Build.props
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
EndProjectSection
EndProject
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

<PropertyGroup Label="Version numbers">
<!-- MAJOR, MINOR, and PATCH are defined according to SemVer 2.0.0. -->
<NtsMajorVersion>3</NtsMajorVersion>
<NtsMajorVersion>4</NtsMajorVersion>
<NtsMinorVersion>0</NtsMinorVersion>
<NtsPatchVersion>0</NtsPatchVersion>

Expand Down
12 changes: 10 additions & 2 deletions src/NetTopologySuite.IO.Oracle/NetTopologySuite.IO.Oracle.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,24 @@
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
<Description>This package contains the Oracle IO library</Description>
<PackageTags>NTS;Oracle</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="NetTopologySuite" Version="[2.1.0, 3.0.0-A)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.9.0" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="23.8.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.8.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion test/NetTopologySuite.IO.Oracle.Test/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--
<add key="TestDBConnectionString" value="User Id=system;Password=oracle;Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=XEPDB1)));"/>
-->
<add key="TestDBConnectionString" value="Data Source=&quot;(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=XE)))&quot;;User Id=system;Password=oracle;"/>
<add key="TestDBConnectionString" value="Data Source=&quot;(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=FREE)))&quot;;User Id=system;Password=oracle;"/>
</appSettings>
</configuration>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6</TargetFrameworks>
<TargetFrameworks>net472;net8</TargetFrameworks>
<LangVersion>8</LangVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<SignAssembly>false</SignAssembly>
Expand All @@ -15,14 +15,14 @@
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<ItemGroup Condition="'$(TargetFramework)' == 'net8'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Update="nunit" Version="4.1.0" />
<PackageReference Update="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Update="nunit" Version="4.3.2" />
<PackageReference Update="NUnit3TestAdapter" Version="5.0.0" />
</ItemGroup>

</Project>