Skip to content

Commit 01d40a8

Browse files
deansheatherdeansheather
committed
fixup! chore: add GitHub actions
1 parent 11c5756 commit 01d40a8

File tree

18 files changed

+1288
-47
lines changed

18 files changed

+1288
-47
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ jobs:
1818
with:
1919
dotnet-version: 8.0.x
2020
cache: true
21-
- name: Install dotnet format
21+
cache-dependency-path: */packages.lock.json
22+
- name: Install dotnet format tool
2223
run: dotnet tool install -g dotnet-format
23-
- name: Run dotnet format
24-
run: dotnet format --verify-no-changes .\Coder.Desktop.sln
24+
- name: dotnet restore
25+
run: dotnet restore --locked-mode .\Coder.Desktop.sln
26+
- name: dotnet format
27+
run: dotnet format --verify-no-changes --no-restore .\Coder.Desktop.sln
2528

2629
test:
2730
runs-on: windows-latest
@@ -32,10 +35,10 @@ jobs:
3235
with:
3336
dotnet-version: 8.0.x
3437
cache: true
35-
- name: Restore dependencies
36-
run: dotnet restore .\Coder.Desktop.sln
37-
- name: Test
38-
run: dotnet test .\Coder.Desktop.sln
38+
- name: dotnet restore
39+
run: dotnet restore --locked-mode .\Coder.Desktop.sln
40+
- name: dotnet test
41+
run: dotnet test --no-restore .\Coder.Desktop.sln
3942

4043
build:
4144
runs-on: windows-latest
@@ -46,11 +49,11 @@ jobs:
4649
with:
4750
dotnet-version: 8.0.x
4851
cache: true
49-
- name: Restore dependencies
50-
run: dotnet restore .\Coder.Desktop.sln
51-
- name: Build
52+
- name: dotnet restore
53+
run: dotnet restore --locked-mode .\Coder.Desktop.sln
54+
- name: dotnet build
5255
run: dotnet build .\Coder.Desktop.sln
53-
- name: Publish
56+
- name: dotnet publish
5457
run: dotnet publish .\Coder.Desktop.sln -c Release -o .\publish
5558
- name: Upload artifact
5659
uses: actions/upload-artifact@v4

‎App/App.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1010
<UseWinUI>true</UseWinUI>
1111
<Nullable>enable</Nullable>
12+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

‎App/packages.lock.json‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net8.0-windows10.0.19041": {
5+
"CommunityToolkit.Mvvm": {
6+
"type": "Direct",
7+
"requested": "[8.4.0, )",
8+
"resolved": "8.4.0",
9+
"contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw=="
10+
},
11+
"DependencyPropertyGenerator": {
12+
"type": "Direct",
13+
"requested": "[1.5.0, )",
14+
"resolved": "1.5.0",
15+
"contentHash": "y9XF3i+U6nnzuVvmwBw7zW+1ztOXT8lMu084Ir4nNeLGVd1308qR2nCR6Yl06FXfjYMKU3+bknZ/otqkz6VEUQ=="
16+
},
17+
"H.NotifyIcon.WinUI": {
18+
"type": "Direct",
19+
"requested": "[2.2.0, )",
20+
"resolved": "2.2.0",
21+
"contentHash": "iWaNX3qbcOWisPygW091RFzY1tl//Nm2HCIzBxFDoz+cpRhdInuV/xelqQ8WQTM0z5PamA9+FgGlSYygzu18Gw==",
22+
"dependencies": {
23+
"H.NotifyIcon": "2.2.0",
24+
"Microsoft.WindowsAppSDK": "1.6.241114003",
25+
"System.Collections.Immutable": "9.0.0",
26+
"System.Reflection.Metadata": "9.0.0"
27+
}
28+
},
29+
"Microsoft.Windows.SDK.BuildTools": {
30+
"type": "Direct",
31+
"requested": "[10.0.26100.1742, )",
32+
"resolved": "10.0.26100.1742",
33+
"contentHash": "ypcHjr4KEi6xQhgClnbXoANHcyyX/QsC4Rky4igs6M4GiDa+weegPo8JuV/VMxqrZCV4zlqDsp2krgkN7ReAAg=="
34+
},
35+
"Microsoft.WindowsAppSDK": {
36+
"type": "Direct",
37+
"requested": "[1.6.250108002, )",
38+
"resolved": "1.6.250108002",
39+
"contentHash": "dOJ3oFeHnehVBAR98lR6YfX0JgDJkrehLqwZQqQE/iZgyye1c1TZu9oj3MBbgWP9xFApWUrb0G49KKnQWEZLtA==",
40+
"dependencies": {
41+
"Microsoft.Web.WebView2": "1.0.2651.64",
42+
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
43+
}
44+
},
45+
"H.GeneratedIcons.System.Drawing": {
46+
"type": "Transitive",
47+
"resolved": "2.2.0",
48+
"contentHash": "KJ/hQZTtW3w8Rw8ktogAwY9AcVzpUldVprTD3eyQ1XyZINLHBQqgtu0ZArmuYlp+lUR0lsqAmaARXZIOFBWmQg==",
49+
"dependencies": {
50+
"System.Drawing.Common": "9.0.0"
51+
}
52+
},
53+
"H.NotifyIcon": {
54+
"type": "Transitive",
55+
"resolved": "2.2.0",
56+
"contentHash": "x3rk9dLAXpMrfngnC7oHmYF4sULEpEdD9hLMIt0W41MZ8WYeCY63SeyJX1TKcvJ7BI24JciLxhXOuWrSRCEiQA==",
57+
"dependencies": {
58+
"H.GeneratedIcons.System.Drawing": "2.2.0"
59+
}
60+
},
61+
"Microsoft.Web.WebView2": {
62+
"type": "Transitive",
63+
"resolved": "1.0.2651.64",
64+
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
65+
},
66+
"Microsoft.Win32.SystemEvents": {
67+
"type": "Transitive",
68+
"resolved": "9.0.0",
69+
"contentHash": "z8FfGIaoeALdD+KF44A2uP8PZIQQtDGiXsOLuN8nohbKhkyKt7zGaZb+fKiCxTuBqG22Q7myIAioSWaIcOOrOw=="
70+
},
71+
"System.Collections.Immutable": {
72+
"type": "Transitive",
73+
"resolved": "9.0.0",
74+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
75+
},
76+
"System.Drawing.Common": {
77+
"type": "Transitive",
78+
"resolved": "9.0.0",
79+
"contentHash": "uoozjI3+dlgKh2onFJcz8aNLh6TRCPlLSh8Dbuljc8CdvqXrxHOVysJlrHvlsOCqceqGBR1wrMPxlnzzhynktw==",
80+
"dependencies": {
81+
"Microsoft.Win32.SystemEvents": "9.0.0"
82+
}
83+
},
84+
"System.Reflection.Metadata": {
85+
"type": "Transitive",
86+
"resolved": "9.0.0",
87+
"contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==",
88+
"dependencies": {
89+
"System.Collections.Immutable": "9.0.0"
90+
}
91+
}
92+
},
93+
"net8.0-windows10.0.19041/win-arm64": {
94+
"Microsoft.WindowsAppSDK": {
95+
"type": "Direct",
96+
"requested": "[1.6.250108002, )",
97+
"resolved": "1.6.250108002",
98+
"contentHash": "dOJ3oFeHnehVBAR98lR6YfX0JgDJkrehLqwZQqQE/iZgyye1c1TZu9oj3MBbgWP9xFApWUrb0G49KKnQWEZLtA==",
99+
"dependencies": {
100+
"Microsoft.Web.WebView2": "1.0.2651.64",
101+
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
102+
}
103+
},
104+
"Microsoft.Web.WebView2": {
105+
"type": "Transitive",
106+
"resolved": "1.0.2651.64",
107+
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
108+
},
109+
"Microsoft.Win32.SystemEvents": {
110+
"type": "Transitive",
111+
"resolved": "9.0.0",
112+
"contentHash": "z8FfGIaoeALdD+KF44A2uP8PZIQQtDGiXsOLuN8nohbKhkyKt7zGaZb+fKiCxTuBqG22Q7myIAioSWaIcOOrOw=="
113+
}
114+
},
115+
"net8.0-windows10.0.19041/win-x64": {
116+
"Microsoft.WindowsAppSDK": {
117+
"type": "Direct",
118+
"requested": "[1.6.250108002, )",
119+
"resolved": "1.6.250108002",
120+
"contentHash": "dOJ3oFeHnehVBAR98lR6YfX0JgDJkrehLqwZQqQE/iZgyye1c1TZu9oj3MBbgWP9xFApWUrb0G49KKnQWEZLtA==",
121+
"dependencies": {
122+
"Microsoft.Web.WebView2": "1.0.2651.64",
123+
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
124+
}
125+
},
126+
"Microsoft.Web.WebView2": {
127+
"type": "Transitive",
128+
"resolved": "1.0.2651.64",
129+
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
130+
},
131+
"Microsoft.Win32.SystemEvents": {
132+
"type": "Transitive",
133+
"resolved": "9.0.0",
134+
"contentHash": "z8FfGIaoeALdD+KF44A2uP8PZIQQtDGiXsOLuN8nohbKhkyKt7zGaZb+fKiCxTuBqG22Q7myIAioSWaIcOOrOw=="
135+
}
136+
},
137+
"net8.0-windows10.0.19041/win-x86": {
138+
"Microsoft.WindowsAppSDK": {
139+
"type": "Direct",
140+
"requested": "[1.6.250108002, )",
141+
"resolved": "1.6.250108002",
142+
"contentHash": "dOJ3oFeHnehVBAR98lR6YfX0JgDJkrehLqwZQqQE/iZgyye1c1TZu9oj3MBbgWP9xFApWUrb0G49KKnQWEZLtA==",
143+
"dependencies": {
144+
"Microsoft.Web.WebView2": "1.0.2651.64",
145+
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
146+
}
147+
},
148+
"Microsoft.Web.WebView2": {
149+
"type": "Transitive",
150+
"resolved": "1.0.2651.64",
151+
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
152+
},
153+
"Microsoft.Win32.SystemEvents": {
154+
"type": "Transitive",
155+
"resolved": "9.0.0",
156+
"contentHash": "z8FfGIaoeALdD+KF44A2uP8PZIQQtDGiXsOLuN8nohbKhkyKt7zGaZb+fKiCxTuBqG22Q7myIAioSWaIcOOrOw=="
157+
}
158+
}
159+
}
160+
}

‎CoderSdk/CoderSdk.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<RootNamespace>Coder.Desktop.CoderSdk</RootNamespace>
54
<TargetFramework>net8.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
7+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
88
</PropertyGroup>
9-
109
</Project>

‎CoderSdk/packages.lock.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net8.0": {}
5+
}
6+
}

‎Package/Package.wapproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@
6464
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
6565
</ItemGroup>
6666
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
67-
</Project>
67+
</Project>

‎Tests.Vpn.Proto/Tests.Vpn.Proto.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,32 @@
55
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
8+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
89

910
<IsPackable>false</IsPackable>
1011
<IsTestProject>true</IsTestProject>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="coverlet.collector" Version="6.0.2">
15+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1516
<PrivateAssets>all</PrivateAssets>
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1718
</PackageReference>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
19-
<PackageReference Include="NUnit" Version="4.2.2"/>
20-
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20+
<PackageReference Include="NUnit" Version="4.3.2" />
21+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
2122
<PrivateAssets>all</PrivateAssets>
2223
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2324
</PackageReference>
24-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
25+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2526
</ItemGroup>
2627

2728
<ItemGroup>
28-
<Using Include="NUnit.Framework"/>
29+
<Using Include="NUnit.Framework" />
2930
</ItemGroup>
3031

3132
<ItemGroup>
32-
<ProjectReference Include="..\Vpn.Proto\Vpn.Proto.csproj"/>
33+
<ProjectReference Include="..\Vpn.Proto\Vpn.Proto.csproj" />
3334
</ItemGroup>
3435

3536
</Project>

‎Tests.Vpn.Proto/packages.lock.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net8.0": {
5+
"coverlet.collector": {
6+
"type": "Direct",
7+
"requested": "[6.0.4, )",
8+
"resolved": "6.0.4",
9+
"contentHash": "lkhqpF8Pu2Y7IiN7OntbsTtdbpR1syMsm2F3IgX6ootA4ffRqWL5jF7XipHuZQTdVuWG/gVAAcf8mjk8Tz0xPg=="
10+
},
11+
"Microsoft.NET.Test.Sdk": {
12+
"type": "Direct",
13+
"requested": "[17.12.0, )",
14+
"resolved": "17.12.0",
15+
"contentHash": "kt/PKBZ91rFCWxVIJZSgVLk+YR+4KxTuHf799ho8WNiK5ZQpJNAEZCAWX86vcKrs+DiYjiibpYKdGZP6+/N17w==",
16+
"dependencies": {
17+
"Microsoft.CodeCoverage": "17.12.0",
18+
"Microsoft.TestPlatform.TestHost": "17.12.0"
19+
}
20+
},
21+
"NUnit": {
22+
"type": "Direct",
23+
"requested": "[4.3.2, )",
24+
"resolved": "4.3.2",
25+
"contentHash": "puVXayXNmEu7MFQSUswGmUjOy3M3baprMbkLl5PAutpeDoGTr+jPv33qAYsqxywi2wJCq8l/O3EhHoLulPE1iQ=="
26+
},
27+
"NUnit.Analyzers": {
28+
"type": "Direct",
29+
"requested": "[4.6.0, )",
30+
"resolved": "4.6.0",
31+
"contentHash": "uK1TEViVBugOO6uDou1amu7CoNhrd2sEUFr/iaEmVfoeY8qq/zzWCCUZi97aCCSZmjnHKCCWKh3RucU27qPlKg=="
32+
},
33+
"NUnit3TestAdapter": {
34+
"type": "Direct",
35+
"requested": "[4.6.0, )",
36+
"resolved": "4.6.0",
37+
"contentHash": "R7e1+a4vuV/YS+ItfL7f//rG+JBvVeVLX4mHzFEZo4W1qEKl8Zz27AqvQSAqo+BtIzUCo4aAJMYa56VXS4hudw=="
38+
},
39+
"Google.Protobuf": {
40+
"type": "Transitive",
41+
"resolved": "3.29.3",
42+
"contentHash": "t7nZFFUFwigCwZ+nIXHDLweXvwIpsOXi+P7J7smPT/QjI3EKxnCzTQOhBqyEh6XEzc/pNH+bCFOOSjatrPt6Tw=="
43+
},
44+
"Microsoft.CodeCoverage": {
45+
"type": "Transitive",
46+
"resolved": "17.12.0",
47+
"contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA=="
48+
},
49+
"Microsoft.TestPlatform.ObjectModel": {
50+
"type": "Transitive",
51+
"resolved": "17.12.0",
52+
"contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==",
53+
"dependencies": {
54+
"System.Reflection.Metadata": "1.6.0"
55+
}
56+
},
57+
"Microsoft.TestPlatform.TestHost": {
58+
"type": "Transitive",
59+
"resolved": "17.12.0",
60+
"contentHash": "MiPEJQNyADfwZ4pJNpQex+t9/jOClBGMiCiVVFuELCMSX2nmNfvUor3uFVxNNCg30uxDP8JDYfPnMXQzsfzYyg==",
61+
"dependencies": {
62+
"Microsoft.TestPlatform.ObjectModel": "17.12.0",
63+
"Newtonsoft.Json": "13.0.1"
64+
}
65+
},
66+
"Newtonsoft.Json": {
67+
"type": "Transitive",
68+
"resolved": "13.0.1",
69+
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
70+
},
71+
"System.Reflection.Metadata": {
72+
"type": "Transitive",
73+
"resolved": "1.6.0",
74+
"contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
75+
},
76+
"vpn.proto": {
77+
"type": "Project",
78+
"dependencies": {
79+
"Google.Protobuf": "[3.29.3, )"
80+
}
81+
}
82+
}
83+
}
84+
}

0 commit comments

Comments
 (0)