Skip to content

Commit 7ee1201

Browse files
wherewherewherewhere
committed
Update to .NET Core App 8.0
1 parent 4230739 commit 7ee1201

File tree

11 files changed

+107
-106
lines changed

11 files changed

+107
-106
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,34 @@ on:
1010
workflow_dispatch:
1111

1212
env:
13-
DOTNET_VERSION: '8.0.x' # The .NET SDK version to use
13+
DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
1414

1515
jobs:
1616
build-and-pack:
1717
name: build-and-pack
1818
runs-on: windows-latest
1919
env:
20-
Nuget_Source: https://nuget.pkg.github.com/yungd1plomat
20+
Nuget_Source: https://nuget.pkg.github.com/SharpAdb/index.json
2121
Solution_Name: AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 0
2828

2929
- name: Setup .NET Core App
30-
uses: actions/setup-dotnet@v3
30+
uses: actions/setup-dotnet@v4
3131
with:
3232
dotnet-version: ${{ env.DOTNET_VERSION }}
33-
dotnet-quality: 'preview'
3433

3534
- name: Setup MSBuild.exe
36-
uses: microsoft/setup-msbuild@v1
35+
uses: microsoft/setup-msbuild@v2
3736
with:
3837
msbuild-architecture: x64
3938

4039
- name: Setup NuGet.exe
41-
uses: NuGet/setup-nuget@v1
40+
uses: NuGet/setup-nuget@v2
4241

4342
- name: Install Dependencies
4443
run: nuget restore $env:Solution_Name
@@ -47,11 +46,11 @@ jobs:
4746
run: msbuild $env:Solution_Name /t:Pack /p:Configuration=Release /p:PackageOutputPath=../nugets /p:VersionSuffix=build.${{ github.run_number }}.${{ github.run_attempt }}
4847

4948
- name: Publish
50-
if: ${{ github.event_name == 'push' && github.ref_name == 'winrt' }}
49+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
5150
run: dotnet nuget push nugets/**.nupkg --source "$env:Nuget_Source" --skip-duplicate --api-key ${{ secrets.NUGET_KEY }}
5251

5352
- name: Upload
54-
uses: actions/upload-artifact@v3
53+
uses: actions/upload-artifact@v4
5554
with:
5655
name: Nuget Package
5756
path: nugets/**

‎AdvancedSharpAdbClient.WinRT.Tests/AdvancedSharpAdbClient.WinRT.Tests.vcxproj‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
43
<PropertyGroup Label="Globals">
54
<CppWinRTOptimized>true</CppWinRTOptimized>
65
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -12,7 +11,12 @@
1211
<RootNamespace>AdvancedSharpAdbClient.WinRT.Tests</RootNamespace>
1312
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0</WindowsTargetPlatformVersion>
1413
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
14+
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
15+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1516
</PropertyGroup>
17+
<ItemGroup>
18+
<ProjectCapability Include="PackageReferences" />
19+
</ItemGroup>
1620
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1721
<ItemGroup Label="ProjectConfigurations">
1822
<ProjectConfiguration Include="Debug|ARM">
@@ -78,7 +82,7 @@
7882
</ImportGroup>
7983
<PropertyGroup Label="UserMacros" />
8084
<PropertyGroup>
81-
<OutDir>bin\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
85+
<OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
8286
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
8387
</PropertyGroup>
8488
<ItemDefinitionGroup>
@@ -132,7 +136,6 @@
132136
</ClCompile>
133137
</ItemGroup>
134138
<ItemGroup>
135-
<None Include="packages.config" />
136139
<None Include="PropertySheet.props" />
137140
<Text Include="readme.txt">
138141
<DeploymentContent>false</DeploymentContent>
@@ -141,23 +144,22 @@
141144
<ItemGroup>
142145
<ProjectReference Include="..\AdvancedSharpAdbClient.WinRT\AdvancedSharpAdbClient.WinRT.csproj">
143146
<Project>{083cdc04-9cc2-46e4-84c2-55b645be9d50}</Project>
144-
<SetTargetFramework>TargetFramework=net6.0-windows10.0.17763.0</SetTargetFramework>
147+
<SetTargetFramework>TargetFramework=net8.0-windows10.0.17763.0</SetTargetFramework>
145148
</ProjectReference>
146149
</ItemGroup>
147150
<ItemGroup>
148151
<Manifest Include="AdvancedSharpAdbClient.WinRT.Tests.exe.manifest">
149152
<DeploymentContent>true</DeploymentContent>
150153
</Manifest>
151154
</ItemGroup>
155+
<ItemGroup>
156+
<PackageReference Include="Microsoft.Windows.CppWinRT">
157+
<Version>2.0.250303.1</Version>
158+
<PrivateAssets>all</PrivateAssets>
159+
</PackageReference>
160+
</ItemGroup>
152161
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
153162
<ImportGroup Label="ExtensionTargets">
154163
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
155164
</ImportGroup>
156-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
157-
<PropertyGroup>
158-
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
159-
</PropertyGroup>
160-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
161-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
162-
</Target>
163165
</Project>

‎AdvancedSharpAdbClient.WinRT.Tests/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj‎

Lines changed: 74 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,100 +2,102 @@
22

33
<PropertyGroup>
44
<FullTargets>True</FullTargets>
5+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">True</IsAotCompatible>
6+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">True</IsTrimmable>
7+
<TargetFrameworks>uap10.0;uap10.0.15138.0</TargetFrameworks>
8+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddWinMDToPackage</TargetsForTfmSpecificContentInPackage>
59
</PropertyGroup>
610

711
<PropertyGroup Condition="'$(FullTargets)' == 'true'">
8-
<NoWarn>NU1603;NU5100</NoWarn>
9-
<OutputPathRoot Condition="'$(Platform)' == 'AnyCPU'">bin\$(Configuration)\</OutputPathRoot>
10-
<OutputPathRoot Condition="'$(Platform)' != 'AnyCPU'">bin\$(Platform)\$(Configuration)\</OutputPathRoot>
11-
<TargetFrameworks>uap10.0;uap10.0.15138.0;net6.0-windows10.0.17763.0</TargetFrameworks>
12+
<NoWarn>$(NoWarn);NU5100</NoWarn>
13+
<TargetFrameworks>$(TargetFrameworks);net8.0-windows10.0.17763.0</TargetFrameworks>
1214
</PropertyGroup>
1315

14-
<PropertyGroup Condition="'$(FullTargets)' != 'true'">
15-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
16-
</PropertyGroup>
17-
18-
<PropertyGroup Condition="'$(TargetFramework)' != 'net6.0-windows10.0.17763.0'">
16+
<PropertyGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0-windows10.0.17763.0'))">
1917
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2018
<DebugType>Full</DebugType>
21-
<NoWarn>CS0419</NoWarn>
2219
<OutputType>winmdobj</OutputType>
23-
<Platforms>AnyCPU;x64;x86;ARM64;ARM</Platforms>
2420
</PropertyGroup>
2521

26-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0-windows10.0.17763.0'">
22+
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0-windows10.0.17763.0'))">
2723
<CsWinRTComponent>true</CsWinRTComponent>
2824
<CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
29-
<NoWarn>CS0618;CS1591</NoWarn>
30-
<Platforms>x64;x86;ARM64;ARM</Platforms>
25+
<NoWarn>$(NoWarn);CS1591</NoWarn>
3126
</PropertyGroup>
3227

3328
<ItemGroup>
34-
<PackageReference Include="AdvancedSharpAdbClient" Version="2.5.7" />
29+
<PackageReference Include="AdvancedSharpAdbClient" Version="2.5.7" />
3530
</ItemGroup>
3631

37-
<ItemGroup>
38-
<None Include="..\logo.png" Pack="true" PackagePath="\Icon.png">
39-
<Link>Assets\Icon.png</Link>
40-
</None>
32+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
33+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(CsWinRTVersion)" GeneratePathProperty="true" />
4134
</ItemGroup>
4235

43-
<ItemGroup Condition="'$(FullTargets)' == 'true'">
44-
<None Include="..\build\*" Pack="true" PackagePath="build\">
45-
<Link>Assets\build\%(FileName)%(Extension)</Link>
46-
</None>
47-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*.dll" Pack="true" PackagePath="build\native\">
48-
<Link>Assets\build\native\%(FileName)%(Extension)</Link>
49-
</None>
50-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.dll" />
51-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll" />
52-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" />
53-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.runtimeconfig.json" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.runtimeconfig.json')" Pack="true" PackagePath="build\native\">
54-
<Link>Assets\build\native\%(FileName)%(Extension)</Link>
55-
</None>
56-
<None Include="$(OutputPathRoot)uap10.0.15138.0\*.dll" Pack="true" PackagePath="build\uap10.0.15138\">
57-
<Link>Assets\build\uap10.0.15138\%(FileName)%(Extension)</Link>
58-
</None>
59-
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Memory.dll" />
60-
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Buffers.dll" />
61-
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Runtime.CompilerServices.Unsafe.dll" />
62-
<None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Condition="Exists('$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll')" Pack="true" PackagePath="build\uap10.0\">
63-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
64-
</None>
65-
<None Include="$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll" Condition="Exists('$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll')" Pack="true" PackagePath="build\uap10.0\">
66-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
67-
</None>
68-
<None Include="$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll')" Pack="true" PackagePath="build\uap10.0\">
69-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
70-
</None>
71-
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Xml.XPath.dll')" Pack="true" PackagePath="build\uap10.0\">
72-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
73-
</None>
74-
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll')" Pack="true" PackagePath="build\uap10.0\">
75-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
76-
</None>
77-
<None Include="..\build\*" Pack="true" PackagePath="buildTransitive\">
78-
<Link>Assets\buildTransitive\%(FileName)%(Extension)</Link>
79-
</None>
80-
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\*" Pack="true" PackagePath="hosting\">
81-
<Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
82-
</None>
83-
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\en-US\*" Pack="true" PackagePath="hosting\">
84-
<Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
85-
</None>
86-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
87-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
36+
<Target Name="AddWinMDToPackage">
37+
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
38+
<TfmSpecificPackageFile Include="$(OutputPath)\AdvancedSharpAdbClient.dll" Condition="Exists('$(OutputPath)\AdvancedSharpAdbClient.dll')">
39+
<PackagePath>build\$(TargetFramework)</PackagePath>
40+
</TfmSpecificPackageFile>
41+
<TfmSpecificPackageFile Include="$(OutputPath)\Microsoft.Extensions.Logging.Abstractions.dll" Condition="Exists('$(OutputPath)\Microsoft.Extensions.Logging.Abstractions.dll')">
42+
<PackagePath>build\$(TargetFramework)</PackagePath>
43+
</TfmSpecificPackageFile>
44+
<TfmSpecificPackageFile Include="$(OutputPath)\System.Runtime.InteropServices.RuntimeInformation.dll" Condition="Exists('$(OutputPath)\System.Runtime.InteropServices.RuntimeInformation.dll')">
45+
<PackagePath>build\$(TargetFramework)</PackagePath>
46+
</TfmSpecificPackageFile>
47+
<TfmSpecificPackageFile Include="$(OutputPath)\System.Xml.XPath.dll" Condition="Exists('$(OutputPath)\System.Xml.XPath.dll')">
48+
<PackagePath>build\$(TargetFramework)</PackagePath>
49+
</TfmSpecificPackageFile>
50+
<TfmSpecificPackageFile Include="$(OutputPath)\System.Xml.XPath.XmlDocument.dll" Condition="Exists('$(OutputPath)\System.Xml.XPath.XmlDocument.dll')">
51+
<PackagePath>build\$(TargetFramework)</PackagePath>
52+
</TfmSpecificPackageFile>
53+
</ItemGroup>
54+
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.15138.0'">
55+
<TfmSpecificPackageFile Include="$(OutputPath)\*.dll">
56+
<PackagePath>build\uap10.0.15138</PackagePath>
57+
</TfmSpecificPackageFile>
58+
<TfmSpecificPackageFile Remove="$(OutputPath)\System.Memory.dll" />
59+
<TfmSpecificPackageFile Remove="$(OutputPath)\System.Buffers.dll" />
60+
<TfmSpecificPackageFile Remove="$(OutputPath)\System.Runtime.CompilerServices.Unsafe.dll" />
61+
</ItemGroup>
62+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.17763.0'">
63+
<TfmSpecificPackageFile Include="$(OutputPath)\*.dll">
64+
<PackagePath>build\native</PackagePath>
65+
</TfmSpecificPackageFile>
66+
<TfmSpecificPackageFile Remove="$(OutputPath)\AdvancedSharpAdbClient.WinRT.dll" />
67+
<TfmSpecificPackageFile Remove="$(OutputPath)\WinRT.Host.dll" />
68+
<TfmSpecificPackageFile Remove="$(OutputPath)\WinRT.Host.Shim.dll" />
69+
<TfmSpecificPackageFile Include="$(OutputPath)\WinRT.Host.runtimeconfig.json" Condition="Exists('$(OutputPath)\WinRT.Host.runtimeconfig.json')">
70+
<PackagePath>build\native</PackagePath>
71+
</TfmSpecificPackageFile>
72+
<TfmSpecificPackageFile Include="$(PkgMicrosoft_Windows_CsWinRT)\hosting\**\native\*">
73+
<PackagePath>hosting</PackagePath>
74+
</TfmSpecificPackageFile>
75+
<TfmSpecificPackageFile Include="$(PkgMicrosoft_Windows_CsWinRT)\hosting\**\native\en-US\*">
76+
<PackagePath>hosting</PackagePath>
77+
</TfmSpecificPackageFile>
78+
<TfmSpecificPackageFile Include="$(OutputPath)\AdvancedSharpAdbClient.WinRT.winmd" Condition="Exists('$(OutputPath)\AdvancedSharpAdbClient.WinRT.winmd')">
79+
<PackagePath>lib\$(TargetFramework)\winmd</PackagePath>
80+
</TfmSpecificPackageFile>
81+
<TfmSpecificPackageFile Include="$(OutputPath)\WinRT.Host.Shim.dll" Condition="Exists('$(OutputPath)\WinRT.Host.Shim.dll')">
82+
<PackagePath>lib\$(TargetFramework)</PackagePath>
83+
</TfmSpecificPackageFile>
84+
<TfmSpecificPackageFile Include="$(OutputPath)\WinRT.Runtime.dll" Condition="Exists('$(OutputPath)\WinRT.Runtime.dll')">
85+
<PackagePath>lib\$(TargetFramework)</PackagePath>
86+
</TfmSpecificPackageFile>
87+
</ItemGroup>
88+
</Target>
89+
90+
<ItemGroup>
91+
<None Include="..\logo.png" PackagePath="\Icon.png" Pack="true">
92+
<Link>Assets\Icon.png</Link>
8893
</None>
89-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
90-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
94+
<None Include="..\README.md" PackagePath="\README.md" Pack="true">
95+
<Link>Assets\README.md</Link>
9196
</None>
92-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
93-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
97+
<None Include="..\build\*" PackagePath="buildTransitive\" Pack="true" />
98+
<None Include="..\build\*" PackagePath="build\" Pack="true">
99+
<Link>Assets\build\%(FileName)%(Extension)</Link>
94100
</None>
95101
</ItemGroup>
96102

97-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows10.0.17763.0'">
98-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(CsWinRTVersion)" />
99-
</ItemGroup>
100-
101103
</Project>

‎AdvancedSharpAdbClient.WinRT/Logs/AndroidLogEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace AdvancedSharpAdbClient.WinRT.Logs
88
{
9-
internal class AndroidLogEntry : ILogEntry
9+
internal partial class AndroidLogEntry : ILogEntry
1010
{
1111
internal readonly AdvancedSharpAdbClient.Logs.AndroidLogEntry androidLogEntry;
1212

‎AdvancedSharpAdbClient.WinRT/Models/Area.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using Windows.Foundation;
66
using Windows.Foundation.Metadata;
7+
using Rect = Windows.Foundation.Rect;
78

89
namespace AdvancedSharpAdbClient.WinRT
910
{

‎AdvancedSharpAdbClient.WinRT/Models/Cords.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// Copyright (c) The Android Open Source Project, Ryan Conrad, Quamotion, yungd1plomat, wherewhere. All rights reserved.
33
// </copyright>
44

5-
using Windows.Foundation;
65
using Windows.Foundation.Metadata;
6+
using Point = Windows.Foundation.Point;
7+
using Size = Windows.Foundation.Size;
78

89
namespace AdvancedSharpAdbClient.WinRT
910
{

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PropertyGroup>
2929
<FullTargets Condition="'$(FullTargets)' == ''">False</FullTargets>
3030
<IsWindows Condition="'$(IsWindows)' == ''">False</IsWindows>
31-
<CsWinRTVersion Condition="'$(CsWinRTVersion)' == ''">2.0.3</CsWinRTVersion>
31+
<CsWinRTVersion Condition="'$(CsWinRTVersion)' == ''">2.2.0</CsWinRTVersion>
3232
<IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows')) == 'True' OR '$(Platform)' == 'Windows NT'">True</IsWindows>
3333
<IsTestProject Condition="'$(IsTestProject)' == ''">$(MSBuildProjectName.Contains('.Test'))</IsTestProject>
3434
</PropertyGroup>

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all">
4+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all">
55
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66
</PackageReference>
77
</ItemGroup>

0 commit comments

Comments
 (0)