Skip to content

Commit dbd5e8d

Browse files
wherewherewherewhere
committed
更新 v0.0.4
1 parent 153cd3e commit dbd5e8d

File tree

9 files changed

+40
-39
lines changed

9 files changed

+40
-39
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ body:
3333
label: App version
3434
description: Specify the version of APK Installer you're using.
3535
options:
36+
- "0.0.4"
3637
- "0.0.3"
3738
- "0.0.2"
3839
- "0.0.1"

‎APKInstaller/APKInstaller.Metadata/APKInstaller.Metadata.vcxproj

Lines changed: 11 additions & 12 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.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
43
<PropertyGroup Label="Globals">
54
<CppWinRTOptimized>true</CppWinRTOptimized>
65
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -17,7 +16,12 @@
1716
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
1817
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
1918
<DesktopCompatible>true</DesktopCompatible>
19+
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
20+
<RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
2021
</PropertyGroup>
22+
<ItemGroup>
23+
<ProjectCapability Include="PackageReferences" />
24+
</ItemGroup>
2125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2226
<ItemGroup Label="ProjectConfigurations">
2327
<ProjectConfiguration Include="Debug|ARM">
@@ -141,16 +145,18 @@
141145
<None Include="APKInstaller.Metadata.def" />
142146
</ItemGroup>
143147
<ItemGroup>
144-
<None Include="packages.config" />
145148
<None Include="PropertySheet.props" />
146149
<Text Include="readme.txt">
147150
<DeploymentContent>false</DeploymentContent>
148151
</Text>
149152
</ItemGroup>
153+
<ItemGroup>
154+
<PackageReference Include="Microsoft.Windows.CppWinRT">
155+
<Version>2.0.240405.15</Version>
156+
<PrivateAssets>all</PrivateAssets>
157+
</PackageReference>
158+
</ItemGroup>
150159
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
151-
<ImportGroup Label="ExtensionTargets">
152-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" />
153-
</ImportGroup>
154160
<Target Name="OutputWinMD" BeforeTargets="BuildCompile">
155161
<PropertyGroup>
156162
<PlatformName Condition="'$(Platform)' == 'Win32'">x86</PlatformName>
@@ -160,11 +166,4 @@
160166
<Copy SourceFiles="$(OutDir)\$(ProjectName).winmd" DestinationFolder="..\..\WinMD\$(PlatformName)\$(Configuration)\" />
161167
<Message Text="Copied output metadata file to '..\..\WinMD\$(PlatformName)\$(Configuration)\'." />
162168
</Target>
163-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
164-
<PropertyGroup>
165-
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
166-
</PropertyGroup>
167-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props'))" />
168-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets'))" />
169-
</Target>
170169
</Project>

‎APKInstaller/APKInstaller.Package/APKInstaller.Package.wapproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
5050
<NoWarn>$(NoWarn);NU1702</NoWarn>
5151
<EntryPointProjectUniqueName>..\APKInstaller\APKInstaller.csproj</EntryPointProjectUniqueName>
52+
<AssetTargetFallback>$(AssetTargetFallback);native</AssetTargetFallback>
5253
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
5354
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
5455
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>

‎APKInstaller/APKInstaller.Package/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Identity
1212
Name="18184wherewhere.AndroidAppInstaller.UWP"
1313
Publisher="CN=2C3A37C0-35FC-4839-B08C-751C1C1AFBF5"
14-
Version="0.0.3.0" />
14+
Version="0.0.4.0" />
1515

1616
<Properties>
1717
<DisplayName>APK 安装程序 - UWP</DisplayName>

‎APKInstaller/APKInstaller.Projection/APKInstaller.Projection.vcxproj

Lines changed: 11 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.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
43
<PropertyGroup Label="Globals">
54
<CppWinRTOptimized>true</CppWinRTOptimized>
65
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -16,7 +15,12 @@
1615
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
1716
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
1817
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
18+
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
19+
<RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
1920
</PropertyGroup>
21+
<ItemGroup>
22+
<ProjectCapability Include="PackageReferences" />
23+
</ItemGroup>
2024
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2125
<ItemGroup Label="ProjectConfigurations">
2226
<ProjectConfiguration Include="Debug|ARM">
@@ -155,15 +159,11 @@
155159
<IsWinMDFile>true</IsWinMDFile>
156160
</Reference>
157161
</ItemGroup>
162+
<ItemGroup>
163+
<PackageReference Include="Microsoft.Windows.CppWinRT">
164+
<Version>2.0.240405.15</Version>
165+
<PrivateAssets>all</PrivateAssets>
166+
</PackageReference>
167+
</ItemGroup>
158168
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
159-
<ImportGroup Label="ExtensionTargets">
160-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" />
161-
</ImportGroup>
162-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
163-
<PropertyGroup>
164-
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
165-
</PropertyGroup>
166-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props'))" />
167-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets'))" />
168-
</Target>
169169
</Project>

‎APKInstaller/APKInstaller.Server/APKInstaller.Server.vcxproj

Lines changed: 11 additions & 12 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.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
43
<PropertyGroup Label="Globals">
54
<CppWinRTOptimized>true</CppWinRTOptimized>
65
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -12,7 +11,12 @@
1211
<RootNamespace>APKInstaller.Server</RootNamespace>
1312
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
1413
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
14+
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
15+
<RuntimeIdentifiers>win-x86;win-x64;win-arm;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">
@@ -136,7 +140,6 @@
136140
<ClInclude Include="resource.h" />
137141
</ItemGroup>
138142
<ItemGroup>
139-
<None Include="packages.config" />
140143
<None Include="PropertySheet.props" />
141144
<Text Include="readme.txt">
142145
<DeploymentContent>false</DeploymentContent>
@@ -148,20 +151,16 @@
148151
<ItemGroup>
149152
<Image Include="favicon.ico" />
150153
</ItemGroup>
154+
<ItemGroup>
155+
<PackageReference Include="Microsoft.Windows.CppWinRT">
156+
<Version>2.0.240405.15</Version>
157+
<PrivateAssets>all</PrivateAssets>
158+
</PackageReference>
159+
</ItemGroup>
151160
<ItemGroup>
152161
<ProjectReference Include="..\APKInstaller.Metadata\APKInstaller.Metadata.vcxproj">
153162
<Project>{36281370-06fb-4857-bcf8-fdd66c8da631}</Project>
154163
</ProjectReference>
155164
</ItemGroup>
156165
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
157-
<ImportGroup Label="ExtensionTargets">
158-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" />
159-
</ImportGroup>
160-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
161-
<PropertyGroup>
162-
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
163-
</PropertyGroup>
164-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props'))" />
165-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets'))" />
166-
</Target>
167166
</Project>

‎APKInstaller/APKInstaller/APKInstaller.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
2222
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
2323
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
24+
<AssetTargetFallback>$(AssetTargetFallback);native</AssetTargetFallback>
2425
</PropertyGroup>
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2627
<DebugSymbols>true</DebugSymbols>

‎APKInstaller/APKInstaller/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Identity
1212
Name="18184wherewhere.AndroidAppInstaller.UWP"
1313
Publisher="CN=2C3A37C0-35FC-4839-B08C-751C1C1AFBF5"
14-
Version="0.0.3.0" />
14+
Version="0.0.4.0" />
1515

1616
<mp:PhoneIdentity PhoneProductId="b74bb720-bf67-4453-bb15-9ac9ba2f0d6a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1717

‎APKInstaller/APKInstaller/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
2424
//通过使用 "*"，如下所示:
2525
// [assembly: AssemblyVersion("1.0.*")]
26-
[assembly: AssemblyVersion("0.0.3.0")]
27-
[assembly: AssemblyFileVersion("0.0.3.0")]
26+
[assembly: AssemblyVersion("0.0.4.0")]
27+
[assembly: AssemblyFileVersion("0.0.4.0")]
2828
[assembly: ComVisible(false)]

0 commit comments

Comments
 (0)