Skip to content
This repository was archived by the owner on Nov 14, 2022. It is now read-only.

Commit b2e64c2

Browse files
authored
Bump System.IO.Packaging from 4.0.5.0 to 6.0.0
Resolved .net4.8 specific dependency issue
2 parents 3b92722 + 7698bb5 commit b2e64c2

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/dotnet.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
deployRelease:
3030
if: github.ref == 'refs/heads/main'
31-
runs-on: ubuntu-latest
31+
runs-on: windows-latest
3232
needs: build
3333
steps:
3434
- uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
4242
run: dotnet build --configuration Release --no-restore
4343
- name: NugetPush
4444
run: |
45-
dotnet nuget push ./ClosedXML/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
45+
dotnet nuget push .\ClosedXML\bin\Release\*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
4646
- uses: "marvinpinto/action-automatic-releases@latest"
4747
with:
4848
repo_token: "${{ secrets.GITHUB_TOKEN }}"
@@ -55,7 +55,7 @@ jobs:
5555
5656
deployTest:
5757
if: github.ref != 'refs/heads/main'
58-
runs-on: ubuntu-latest
58+
runs-on: windows-latest
5959
needs: build
6060
steps:
6161
- uses: actions/checkout@v2
@@ -70,7 +70,7 @@ jobs:
7070
- name: NugetPush
7171
run: |
7272
ls ./ClosedXML/bin/Release
73-
dotnet nuget push ./ClosedXML/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
73+
dotnet nuget push .\ClosedXML\bin\Release\*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
7474
- uses: "marvinpinto/action-automatic-releases@latest"
7575
with:
7676
repo_token: "${{ secrets.GITHUB_TOKEN }}"

ClosedXML/ClosedXML.csproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
45
<LangVersion>8.0</LangVersion>
56
<AssemblyName>ClosedXML</AssemblyName>
67
<PackageId>DocumentPartner.ClosedXML</PackageId>
@@ -33,7 +34,7 @@
3334
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
3435
</PropertyGroup>
3536
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
36-
<Optimize>True</Optimize>
37+
<Optimize>True</Optimize>
3738
</PropertyGroup>
3839
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
3940
</PropertyGroup>
@@ -57,4 +58,8 @@
5758
<PackageReference Include="SkiaSharp" Version="2.80.2" />
5859
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.2" />
5960
</ItemGroup>
60-
</Project>
61+
62+
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
63+
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
64+
</ItemGroup>
65+
</Project>

ClosedXML_Sandbox/ClosedXML_Sandbox.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,4 @@
1616
<ProjectReference Include="..\ClosedXML\ClosedXML.csproj" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
20-
<PackageReference Include="System.IO.Packaging" Version="4.0.5.0" />
21-
</ItemGroup>
2219
</Project>

ClosedXML_Tests/ClosedXML_Tests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
<EmbeddedResource Include="Resource\Images\*.jpg" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
23-
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
24-
</ItemGroup>
22+
2523

2624
<ItemGroup>
2725
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

0 commit comments

Comments
 (0)