Skip to content

Commit 652b0f6

Browse files
huaxing-yuanhuaxing-yuan
authored
Merge pull request #103 from AxaFrance/develop
update nuspec
2 parents 4ef4c1d + 419fb4c commit 652b0f6

File tree

2 files changed

+26
-32
lines changed

2 files changed

+26
-32
lines changed

‎src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.nuspec‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,32 @@
1212
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
1313
<dependency id="AvalonEdit" version="6.3.1.120" exclude="Build,Analyzers" />
1414
<dependency id="Hummingbird.UI" version="1.2.2772.2" exclude="Build,Analyzers" />
15-
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc4.5" exclude="Build,Analyzers" />
16-
<dependency id="Microsoft.Web.WebView2" version="1.0.3351.48" exclude="Build,Analyzers" />
17-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
15+
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc5.1" exclude="Build,Analyzers" />
16+
<dependency id="Microsoft.Web.WebView2" version="1.0.3650.58" exclude="Build,Analyzers" />
17+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
1818
</group>
1919
<group targetFramework="net8.0-windows7.0">
2020
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
2121
<dependency id="AvalonEdit" version="6.3.1.120" exclude="Build,Analyzers" />
2222
<dependency id="Hummingbird.UI" version="1.2.2772.2" exclude="Build,Analyzers" />
23-
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc4.5" exclude="Build,Analyzers" />
24-
<dependency id="Microsoft.Web.WebView2" version="1.0.3351.48" exclude="Build,Analyzers" />
25-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
23+
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc5.1" exclude="Build,Analyzers" />
24+
<dependency id="Microsoft.Web.WebView2" version="1.0.3650.58" exclude="Build,Analyzers" />
25+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
2626
</group>
27-
<group targetFramework="net9.0-windows7.0">
27+
<group targetFramework="net10.0-windows7.0">
2828
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
2929
<dependency id="AvalonEdit" version="6.3.1.120" exclude="Build,Analyzers" />
3030
<dependency id="Hummingbird.UI" version="1.2.2772.2" exclude="Build,Analyzers" />
31-
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc4.5" exclude="Build,Analyzers" />
32-
<dependency id="Microsoft.Web.WebView2" version="1.0.3351.48" exclude="Build,Analyzers" />
33-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
31+
<dependency id="LiveChartsCore.SkiaSharpView.WPF" version="2.0.0-rc5.1" exclude="Build,Analyzers" />
32+
<dependency id="Microsoft.Web.WebView2" version="1.0.3650.58" exclude="Build,Analyzers" />
33+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
3434
</group>
3535
</dependencies>
3636
<frameworkReferences>
37-
<group targetFramework="net6.0-windows7.0">
38-
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
39-
</group>
4037
<group targetFramework="net8.0-windows7.0">
4138
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
4239
</group>
43-
<group targetFramework="net9.0-windows7.0">
40+
<group targetFramework="net10.0-windows7.0">
4441
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
4542
</group>
4643
</frameworkReferences>
@@ -57,7 +54,7 @@
5754
<contentFiles>
5855
<files include="any/net48/*.config" buildAction="None" copyToOutput="true" />
5956
<files include="any/net8.0-windows7.0/*.json" buildAction="None" copyToOutput="true" />
60-
<files include="any/net9.0-windows7.0/*.json" buildAction="None" copyToOutput="true" />
57+
<files include="any/net10.0-windows10.0/*.json" buildAction="None" copyToOutput="true" />
6158
</contentFiles>
6259
</metadata>
6360
<files>
@@ -71,8 +68,8 @@
7168
<file src="net8.0-windows\*.json" target="contentFiles\any\net8.0-windows7.0" />
7269

7370
<!-- Include net9.0 -->
74-
<file src="net9.0-windows\**\*.dll" target="lib\net9.0-windows7.0" />
75-
<file src="net9.0-windows\**\*.exe" target="lib\net9.0-windows7.0" />
76-
<file src="net9.0-windows\*.json" target="contentFiles\any\net9.0-windows7.0" />
71+
<file src="net10.0-windows\**\*.dll" target="lib\net10.0-windows7.0" />
72+
<file src="net10.0-windows\**\*.exe" target="lib\net10.0-windows7.0" />
73+
<file src="net10.0-windows\*.json" target="contentFiles\any\net10.0-windows7.0" />
7774
</files>
7875
</package>

‎src/AxaFrance.WebEngine.Runner/axafrance.webengine.webrunner.nuspec‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,18 @@
1212
<dependencies>
1313
<group targetFramework=".NETFramework4.8">
1414
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
15-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
16-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
17-
<dependency id="System.Text.Json" version="9.0.7" exclude="Build,Analyzers" />
15+
<dependency id="Newtonsoft.Json" version="13.0.4" exclude="Build,Analyzers" />
16+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
1817
</group>
1918
<group targetFramework="net8.0">
2019
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
21-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
22-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
23-
<dependency id="System.Text.Json" version="9.0.7" exclude="Build,Analyzers" />
20+
<dependency id="Newtonsoft.Json" version="13.0.4" exclude="Build,Analyzers" />
21+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
2422
</group>
2523
<group targetFramework="net9.0">
2624
<dependency id="AxaFrance.WebEngine" version="{{version}}" exclude="Build,Analyzers" />
27-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
28-
<dependency id="SkiaSharp" version="3.119.0" exclude="Build,Analyzers" />
29-
<dependency id="System.Text.Json" version="9.0.7" exclude="Build,Analyzers" />
25+
<dependency id="Newtonsoft.Json" version="13.0.4" exclude="Build,Analyzers" />
26+
<dependency id="SkiaSharp" version="3.119.1" exclude="Build,Analyzers" />
3027
</group>
3128
</dependencies>
3229
<frameworkAssemblies>
@@ -42,7 +39,7 @@
4239
<contentFiles>
4340
<files include="any/net48/*.config" buildAction="None" copyToOutput="true" />
4441
<files include="any/net8.0/*.json" buildAction="None" copyToOutput="true" />
45-
<files include="any/net9.0/*.json" buildAction="None" copyToOutput="true" />
42+
<files include="any/net10.0/*.json" buildAction="None" copyToOutput="true" />
4643
</contentFiles>
4744
</metadata>
4845
<files>
@@ -55,10 +52,10 @@
5552
<file src="net8.0\**\*.exe" target="lib\net8.0" />
5653
<file src="net8.0\*.json" target="contentFiles\any\net8.0" />
5754

58-
<!-- Include net9.0 -->
59-
<file src="net9.0\**\*.dll" target="lib\net9.0" />
60-
<file src="net9.0\**\*.exe" target="lib\net9.0" />
61-
<file src="net9.0\*.json" target="contentFiles\any\net9.0" />
55+
<!-- Include net10.0 -->
56+
<file src="net10.0\**\*.dll" target="lib\net10.0" />
57+
<file src="net10.0\**\*.exe" target="lib\net10.0" />
58+
<file src="net10.0\*.json" target="contentFiles\any\net10.0" />
6259
</files>
6360

6461
</package>

0 commit comments

Comments
 (0)