Skip to content

Commit 2f3ff9a

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 2c7d53f + 38c8f7b commit 2f3ff9a

Some content is hidden

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

72 files changed

+15814
-18623
lines changed

.github/workflows/dotnet.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ env:
1212
jobs:
1313
build:
1414

15-
runs-on: windows-latest
15+
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- name: Setup .NET
20-
uses: actions/setup-dotnet@v1
20+
uses: actions/setup-dotnet@v3
2121
with:
22-
dotnet-version: 6.0.x
22+
dotnet-version: 8.0.x
2323
- name: Restore dependencies
24-
run: dotnet restore /p:Configuration=$env:BUILD_CONF
24+
run: dotnet restore
2525
- name: Build
26-
run: dotnet build /p:Configuration=$env:BUILD_CONF
26+
run: dotnet build -c $BUILD_CONF
2727
- name: Test
28-
run: dotnet test /p:Configuration=$env:BUILD_CONF
28+
run: dotnet test -c $BUILD_CONF
2929
- name: Upload Artifact
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: nuget-packages
3333
path: '**/*.nupkg'
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Download NuGet packages
42-
uses: actions/download-artifact@v3
42+
uses: actions/download-artifact@v4
4343
with:
4444
name: nuget-packages
4545
- name: Push NuGet package

CSharpFITS/CSharpFITS.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net20;net35;net40;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
77
<Product>CSharpFITS</Product>
88
<Company>Virtual Observatory India</Company>
99
<Copyright>Thomas McGlynn 1997-2007, Virtual Observatory - India 2007.</Copyright>
10+
<LangVersion>9.0</LangVersion>
1011
<PackageLicenseFile>license.txt</PackageLicenseFile>
11-
<AssemblyVersion>1.1.3.0</AssemblyVersion>
12-
<FileVersion>1.1.3.0</FileVersion>
12+
<AssemblyVersion>1.1.7.0</AssemblyVersion>
13+
<FileVersion>1.1.7.0</FileVersion>
1314
<PackageTags>Astronomy,FITS,Image</PackageTags>
14-
<RepositoryUrl>https://github.com/sebgod/csharpfits-rwg0</RepositoryUrl>
15-
<PackageProjectUrl>https://github.com/sebgod/csharpfits-rwg0</PackageProjectUrl>
15+
<RepositoryUrl>https://github.com/SharpAstro/csharpfits-rwg0</RepositoryUrl>
16+
<PackageProjectUrl>https://github.com/SharpAstro/csharpfits-rwg0</PackageProjectUrl>
1617
<Description>Supports reading and writing FITS files</Description>
17-
<Version>1.1.3</Version>
18+
<Version>1.1.7</Version>
1819
<Authors>Virtual Observatory - India</Authors>
1920
<PackageId>CSharpFITS-rgw0</PackageId>
2021
<RootNamespace>nom.tam</RootNamespace>

0 commit comments

Comments
 (0)