Skip to content

Commit 79c2704

Browse files
Packaging app
1 parent 522ce80 commit 79c2704

File tree

59 files changed

+304
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+304
-14
lines changed

Solution.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IntDir>$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
5+
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
6+
<GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
7+
</PropertyGroup>
8+
</Project>

VBAudioRouter.Host/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System;
33
using System.Runtime;
44
using System.Runtime.InteropServices;
5-
using System.Threading;
65

76
namespace VBAudioRouter.Host
87
{
@@ -24,7 +23,7 @@ static void Main(string[] args)
2423
{
2524
try
2625
{
27-
VBAudioRouter.Program.WinMain(args);
26+
VBAudioRouter.Program.Win32Main(args);
2827
}
2928
catch (Exception ex)
3029
{

VBAudioRouter.Host/VBAudioRouter.Host.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AssetTargetFallback>uap10.0.19041</AssetTargetFallback>
77
<TargetPlatformVersion>10.0.19041</TargetPlatformVersion>
8+
<ApplicationManifest>app.manifest</ApplicationManifest>
89
<LangVersion>9</LangVersion>
910
<Platforms>x64;x86</Platforms>
10-
<ApplicationManifest>app.manifest</ApplicationManifest>
11-
<!--<SelfContained>true</SelfContained>
12-
<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
11+
<RuntimeIdentifiers>win10-x64;win-x64;win10-x86;win-x86</RuntimeIdentifiers>
1312
</PropertyGroup>
1413

1514
<PropertyGroup>
@@ -18,7 +17,7 @@
1817

1918
<ItemGroup>
2019
<PackageReference Include="Microsoft.Toolkit.Win32.UI.SDK" Version="6.1.2" />
21-
<PackageReference Include="Sentry" Version="3.17.1" />
20+
<PackageReference Include="Sentry" Version="3.20.1" />
2221
</ItemGroup>
2322

2423
<ItemGroup>
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Package
4+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5+
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
6+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
7+
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
8+
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
9+
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
10+
xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10"
11+
IgnorableNamespaces="uap mp uap3 rescap iot">
12+
13+
<Identity
14+
Name="33942ShortDevelopment.VBAudioRouter"
15+
Publisher="CN=8E251084-44E9-4A7C-AB50-C78A32C26285"
16+
Version="0.1.0.0" />
17+
18+
<mp:PhoneIdentity PhoneProductId="01b3c67a-5047-40be-a169-edc3d6902f11" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
19+
20+
<Properties>
21+
<DisplayName>VB Audio Router</DisplayName>
22+
<PublisherDisplayName>ShortDevelopment</PublisherDisplayName>
23+
<Logo>Assets\StoreLogo.png</Logo>
24+
</Properties>
25+
26+
<Dependencies>
27+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
28+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
29+
</Dependencies>
30+
31+
<Resources>
32+
<Resource Language="x-generate"/>
33+
</Resources>
34+
35+
<Applications>
36+
<Application Id="App"
37+
desktop4:SupportsMultipleInstances="true"
38+
Executable="$targetnametoken$.exe"
39+
EntryPoint="$targetentrypoint$">
40+
<uap:VisualElements
41+
DisplayName="VB Audio Router"
42+
Square150x150Logo="Assets\Square150x150Logo.png"
43+
Square44x44Logo="Assets\Square44x44Logo.png"
44+
Description="OpenSource advanced audio rooting application build with UWP and the WinRT Audio Graph API"
45+
BackgroundColor="transparent">
46+
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png" ShortName="Audio Router">
47+
<uap:ShowNameOnTiles>
48+
<uap:ShowOn Tile="square150x150Logo"/>
49+
<uap:ShowOn Tile="wide310x150Logo"/>
50+
<uap:ShowOn Tile="square310x310Logo"/>
51+
</uap:ShowNameOnTiles>
52+
</uap:DefaultTile >
53+
<uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#E87D0D"/>
54+
</uap:VisualElements>
55+
<Extensions>
56+
<uap:Extension Category="windows.fileTypeAssociation">
57+
<uap:FileTypeAssociation Name="audiograph">
58+
<uap:Logo>Assets\StoreLogo.png</uap:Logo>
59+
<uap:SupportedFileTypes>
60+
<uap:FileType>.audiograph</uap:FileType>
61+
</uap:SupportedFileTypes>
62+
</uap:FileTypeAssociation>
63+
</uap:Extension>
64+
<uap:Extension Category="windows.protocol">
65+
<uap:Protocol Name="vb-audio-router">
66+
<uap:Logo>Assets\StoreLogo.png</uap:Logo>
67+
<uap:DisplayName>VB Audio Router</uap:DisplayName>
68+
</uap:Protocol>
69+
</uap:Extension>
70+
</Extensions>
71+
</Application>
72+
</Applications>
73+
74+
<Capabilities>
75+
<Capability Name="internetClient" />
76+
<rescap:Capability Name="runFullTrust" />
77+
</Capabilities>
78+
</Package>
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
4+
<VisualStudioVersion>15.0</VisualStudioVersion>
5+
</PropertyGroup>
6+
<ItemGroup Label="ProjectConfigurations">
7+
<ProjectConfiguration Include="Debug|x86">
8+
<Configuration>Debug</Configuration>
9+
<Platform>x86</Platform>
10+
</ProjectConfiguration>
11+
<ProjectConfiguration Include="Release|x86">
12+
<Configuration>Release</Configuration>
13+
<Platform>x86</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="Debug|x64">
16+
<Configuration>Debug</Configuration>
17+
<Platform>x64</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="Release|x64">
20+
<Configuration>Release</Configuration>
21+
<Platform>x64</Platform>
22+
</ProjectConfiguration>
23+
</ItemGroup>
24+
<PropertyGroup>
25+
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
26+
</PropertyGroup>
27+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
28+
<PropertyGroup>
29+
<ProjectGuid>2918514e-3a00-43f9-a4eb-f4dca374f7d8</ProjectGuid>
30+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
31+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
32+
<DefaultLanguage>en-US</DefaultLanguage>
33+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
34+
<NoWarn>$(NoWarn);NU1702</NoWarn>
35+
<EntryPointProjectUniqueName>..\VBAudioRouter.Host\VBAudioRouter.Host.csproj</EntryPointProjectUniqueName>
36+
</PropertyGroup>
37+
<ItemGroup>
38+
<AppxManifest Include="Package.appxmanifest">
39+
<SubType>Designer</SubType>
40+
</AppxManifest>
41+
</ItemGroup>
42+
<ItemGroup>
43+
<Content Include="Assets\LargeTile.scale-100.png" />
44+
<Content Include="Assets\LargeTile.scale-125.png" />
45+
<Content Include="Assets\LargeTile.scale-150.png" />
46+
<Content Include="Assets\LargeTile.scale-200.png" />
47+
<Content Include="Assets\LargeTile.scale-400.png" />
48+
<Content Include="Assets\SmallTile.scale-100.png" />
49+
<Content Include="Assets\SmallTile.scale-125.png" />
50+
<Content Include="Assets\SmallTile.scale-150.png" />
51+
<Content Include="Assets\SmallTile.scale-200.png" />
52+
<Content Include="Assets\SmallTile.scale-400.png" />
53+
<Content Include="Assets\SplashScreen.scale-100.png" />
54+
<Content Include="Assets\SplashScreen.scale-125.png" />
55+
<Content Include="Assets\SplashScreen.scale-150.png" />
56+
<Content Include="Assets\SplashScreen.scale-200.png" />
57+
<Content Include="Assets\SplashScreen.scale-400.png" />
58+
<Content Include="Assets\Square150x150Logo.scale-100.png" />
59+
<Content Include="Assets\Square150x150Logo.scale-125.png" />
60+
<Content Include="Assets\Square150x150Logo.scale-150.png" />
61+
<Content Include="Assets\Square150x150Logo.scale-200.png" />
62+
<Content Include="Assets\Square150x150Logo.scale-400.png" />
63+
<Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
64+
<Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
65+
<Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
66+
<Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
67+
<Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
68+
<Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
69+
<Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-24.png" />
70+
<Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
71+
<Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-32.png" />
72+
<Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
73+
<Content Include="Assets\Square44x44Logo.scale-100.png" />
74+
<Content Include="Assets\Square44x44Logo.scale-125.png" />
75+
<Content Include="Assets\Square44x44Logo.scale-150.png" />
76+
<Content Include="Assets\Square44x44Logo.scale-200.png" />
77+
<Content Include="Assets\Square44x44Logo.scale-400.png" />
78+
<Content Include="Assets\Square44x44Logo.targetsize-16.png" />
79+
<Content Include="Assets\Square44x44Logo.targetsize-24.png" />
80+
<Content Include="Assets\Square44x44Logo.targetsize-256.png" />
81+
<Content Include="Assets\Square44x44Logo.targetsize-32.png" />
82+
<Content Include="Assets\Square44x44Logo.targetsize-48.png" />
83+
<Content Include="Assets\StoreLogo.scale-100.png" />
84+
<Content Include="Assets\StoreLogo.scale-125.png" />
85+
<Content Include="Assets\StoreLogo.scale-150.png" />
86+
<Content Include="Assets\StoreLogo.scale-200.png" />
87+
<Content Include="Assets\StoreLogo.scale-400.png" />
88+
<Content Include="Assets\Wide310x150Logo.scale-100.png" />
89+
<Content Include="Assets\Wide310x150Logo.scale-125.png" />
90+
<Content Include="Assets\Wide310x150Logo.scale-150.png" />
91+
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
92+
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
93+
</ItemGroup>
94+
<ItemGroup>
95+
<ProjectReference Include="..\VBAudioRouter.Host\VBAudioRouter.Host.csproj">
96+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
97+
</ProjectReference>
98+
<ProjectReference Include="..\VBAudioRouter.UWP\VBAudioRouter.UWP.vbproj" />
99+
</ItemGroup>
100+
<ItemGroup>
101+
<SDKReference Include="Microsoft.VCLibs,Version=14.0">
102+
<TargetedSDKConfiguration Condition="'$(Configuration)'!='Debug'">Retail</TargetedSDKConfiguration>
103+
<TargetedSDKConfiguration Condition="'$(Configuration)'=='Debug'">Debug</TargetedSDKConfiguration>
104+
<TargetedSDKArchitecture>$(PlatformShortName)</TargetedSDKArchitecture>
105+
<Implicit>true</Implicit>
106+
</SDKReference>
107+
</ItemGroup>
108+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
109+
<Target Name="_StompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
110+
<ItemGroup>
111+
<_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />
112+
<_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
113+
<_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
114+
<SourceProject>
115+
</SourceProject>
116+
<TargetPath Condition="'%(FileName)%(Extension)'=='resources.pri'">app_resources.pri</TargetPath>
117+
</_FilteredNonWapProjProjectOutput>
118+
</ItemGroup>
119+
</Target>
120+
</Project>

VBAudioRouter.UWP/Program.vb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
Partial Public Class Program
1+
Imports ShortDev.Uwp.FullTrust.Xaml
2+
3+
Partial Public Class Program
24

35
<MTAThread()>
46
Shared Sub Main(ByVal args() As String)
57
Application.Start(Function(p) New App())
68
End Sub
79

8-
Public Shared Sub WinMain(args As String())
9-
FullTrustApplication.Start(Function(p) New App())
10+
Public Shared Sub Win32Main(args As String())
11+
FullTrustApplication.Start(Function(p) New App(), New XamlWindowConfig("VBAudioRouter"))
1012
End Sub
1113

1214
End Class

VBAudioRouter.UWP/VBAudioRouter.UWP.vbproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<EnableTypeInfoReflection>false</EnableTypeInfoReflection>
6+
<EnableXBindDiagnostics>false</EnableXBindDiagnostics>
67
</PropertyGroup>
78
<PropertyGroup>
89
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,7 +34,7 @@
3334
<DefineDebug>true</DefineDebug>
3435
<DefineTrace>true</DefineTrace>
3536
<OutputPath>bin\x86\Debug\</OutputPath>
36-
<DefineConstants>DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION=True,NETFX_CORE,WINDOWS_UWP,CODE_ANALYSIS</DefineConstants>
37+
<DefineConstants>DISABLE_XAML_GENERATED_MAIN,NETFX_CORE,WINDOWS_UWP,CODE_ANALYSIS</DefineConstants>
3738
<DebugType>full</DebugType>
3839
<PlatformTarget>x86</PlatformTarget>
3940
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -46,7 +47,7 @@
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
4748
<DefineTrace>true</DefineTrace>
4849
<OutputPath>bin\x86\Release\</OutputPath>
49-
<DefineConstants>NETFX_CORE,WINDOWS_UWP</DefineConstants>
50+
<DefineConstants>DISABLE_XAML_GENERATED_MAIN;NETFX_CORE;WINDOWS_UWP</DefineConstants>
5051
<Optimize>true</Optimize>
5152
<DebugType>pdbonly</DebugType>
5253
<PlatformTarget>x86</PlatformTarget>
@@ -63,7 +64,7 @@
6364
<DefineDebug>true</DefineDebug>
6465
<DefineTrace>true</DefineTrace>
6566
<OutputPath>bin\x64\Debug\</OutputPath>
66-
<DefineConstants>DISABLE_XAML_GENERATED_MAIN,NETFX_CORE,WINDOWS_UWP,CODE_ANALYSIS</DefineConstants>
67+
<DefineConstants>DISABLE_XAML_GENERATED_MAIN;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
6768
<DebugType>full</DebugType>
6869
<PlatformTarget>x64</PlatformTarget>
6970
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -76,7 +77,7 @@
7677
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
7778
<DefineTrace>true</DefineTrace>
7879
<OutputPath>bin\x64\Release\</OutputPath>
79-
<DefineConstants>NETFX_CORE,WINDOWS_UWP</DefineConstants>
80+
<DefineConstants>DISABLE_XAML_GENERATED_MAIN;NETFX_CORE;WINDOWS_UWP</DefineConstants>
8081
<Optimize>true</Optimize>
8182
<DebugType>pdbonly</DebugType>
8283
<PlatformTarget>x64</PlatformTarget>
@@ -376,11 +377,14 @@
376377
</ItemGroup>
377378
<ItemGroup>
378379
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
379-
<Version>6.2.13</Version>
380+
<Version>6.2.14</Version>
380381
</PackageReference>
381382
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
382383
<Version>7.1.2</Version>
383384
</PackageReference>
385+
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
386+
<Version>6.1.3</Version>
387+
</PackageReference>
384388
<PackageReference Include="Microsoft.UI.Xaml">
385389
<Version>2.8.0-prerelease.220712001</Version>
386390
</PackageReference>

0 commit comments

Comments
 (0)