Skip to content

Commit 95f9d00

Browse files
committed
Слияние
2 parents ffe5247 + ce06133 commit 95f9d00

2 files changed

Lines changed: 6 additions & 20 deletions

File tree

.github/workflows/publish.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ jobs:
2525
uses: actions/checkout@v3
2626
with:
2727
fetch-depth: 0
28-
29-
- name: Use .NET
30-
uses: actions/setup-dotnet@v3
31-
with:
32-
dotnet-version: 7.0.x
3328

3429
- name: Cache NuGet
3530
uses: actions/cache@v3
@@ -63,12 +58,7 @@ jobs:
6358
needs: [build]
6459
runs-on: ubuntu-latest
6560

66-
steps:
67-
- name: Install .NET Core
68-
uses: actions/setup-dotnet@v3
69-
with:
70-
dotnet-version: 7.0.x
71-
61+
steps:
7262
- name: Get artifact
7363
uses: actions/download-artifact@v3.0.1
7464
id: download
@@ -84,12 +74,7 @@ jobs:
8474
needs: [build]
8575
runs-on: ubuntu-latest
8676

87-
steps:
88-
- name: Install .NET Core
89-
uses: actions/setup-dotnet@v3
90-
with:
91-
dotnet-version: 7.0.x
92-
77+
steps:
9378
- name: Get artifact
9479
uses: actions/download-artifact@v3.0.1
9580
id: download

MathCore.Hosting.WPF/MathCore.Hosting.WPF.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
net8.0-windows;
77
net7.0-windows;
88
net6.0-windows;
9-
net5.0-windows;
10-
net461;
9+
net4.8-windows;
10+
net4.7-windows;
11+
net4.6.1-windows;
1112
</TargetFrameworks>
1213
<UseWPF>true</UseWPF>
1314
<Nullable>enable</Nullable>
@@ -49,7 +50,7 @@
4950

5051
<ItemGroup>
5152
<PackageReference Include="MathCore.Hosting" Version="0.0.4.3" />
52-
<PackageReference Include="MathCore.WPF" Version="0.0.44.5" />
53+
<PackageReference Include="MathCore.WPF" Version="0.0.44.6" />
5354
</ItemGroup>
5455

5556
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-windows'">

0 commit comments

Comments
 (0)