Skip to content

Commit ff2a083

Browse files
committed
Update build workflow and project warnings
Removed unnecessary NuGet setup and GITHUB_ACTIONS property from the build workflow. Adjusted NoWarn properties in the project file to suppress additional NuGet warnings and reorganized property groups. Fixed type in SocketBasedTests to use IDummyAdbSocket for AdbSocketFactory.
1 parent 538eca2 commit ff2a083

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,8 @@ jobs:
6767
with:
6868
msbuild-architecture: x64
6969

70-
- name: Setup NuGet.exe
71-
uses: NuGet/setup-nuget@v2
72-
7370
- name: Install Dependencies
74-
run: msbuild $env:Solution_Name /t:Restore /p:FullTargets=true /p:GITHUB_ACTIONS=false
71+
run: msbuild $env:Solution_Name /t:Restore /p:FullTargets=true
7572

7673
- name: Pack
7774
run: msbuild $env:Solution_Name /t:Pack /p:FullTargets=true /p:Configuration=Release /p:PackageOutputPath=../nugets /p:VersionSuffix=build.${{ github.run_number }}.${{ github.run_attempt }}

AdvancedSharpAdbClient.Tests/SocketBasedTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class SocketBasedTests
1212
{
1313
protected SocketBasedTests(bool integrationTest, bool doDispose)
1414
{
15-
Func<EndPoint, IAdbSocket> AdbSocketFactory;
15+
Func<EndPoint, IDummyAdbSocket> AdbSocketFactory;
1616

1717
// this.EndPoint = AdbClient.Instance.EndPoint;
1818
#if DEBUG
@@ -37,7 +37,7 @@ protected SocketBasedTests(bool integrationTest, bool doDispose)
3737
AdbSocketFactory = endPoint => socket;
3838
IntegrationTest = false;
3939
#endif
40-
Socket = (IDummyAdbSocket)AdbSocketFactory(EndPoint);
40+
Socket = AdbSocketFactory(EndPoint);
4141

4242
TestClient = new AdbClient(AdbSocketFactory);
4343
}

AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj

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

33
<PropertyGroup>
4-
<CheckNotRecommendedTargetFramework>False</CheckNotRecommendedTargetFramework>
54
<FullTargets>True</FullTargets>
65
<ImportAsync>True</ImportAsync>
76
<Nullable>Enable</Nullable>
@@ -11,13 +10,14 @@
1110
</PropertyGroup>
1211

1312
<PropertyGroup>
14-
<NoWarn>$(NoWarn);NU1903</NoWarn>
13+
<CheckNotRecommendedTargetFramework>False</CheckNotRecommendedTargetFramework>
14+
<NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
1515
<TargetFrameworks>net8.0;net10.0;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
1616
<TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net3.5-client;net4.5;net4.8;net8.0-windows10.0.17763.0;net10.0-windows10.0.17763.0</TargetFrameworks>
1717
</PropertyGroup>
1818

1919
<PropertyGroup Condition="'$(FullTargets)' == 'True'">
20-
<NoWarn>$(NoWarn);NU1603;NU1605;NU1902</NoWarn>
20+
<NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
2121
<TargetFrameworks>$(TargetFrameworks);net6.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
2222
<TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net4.0-client;net4.6.1</TargetFrameworks>
2323
<TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'True' and '$(IsWindows)' == 'True'">$(TargetFrameworks);netcore5.0;uap10.0;uap10.0.15138.0</TargetFrameworks>

0 commit comments

Comments
 (0)