tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move ControlCatalog.MacCatalyst/tvOS to their own folders (#19709) 

* Move ControlCatalog.MacCatalyst/tvOS to their own folders

* Exclude tvOS/MacCatalyst from CI builds
pull/19739/head
Julien Lebosquain 4 months ago
committed by GitHub
parent
382e1f7f16
commit
d7f417017d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
10 changed files with 43 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Avalonia.sln
  2. 2
      dirs.proj
  3. 19
      samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
  4. 5
      samples/ControlCatalog.MacCatalyst/Entitlements.plist
  5. 2
      samples/ControlCatalog.MacCatalyst/Info.plist
  6. 15
      samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
  7. 0
      samples/ControlCatalog.iOS/Info.plist
  8. 19
      samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj
  9. 5
      samples/ControlCatalog.tvOS/Entitlements.plist
  10. 0
      samples/ControlCatalog.tvOS/Info.plist

4
Avalonia.sln
View File

@ -303,9 +303,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Automation",
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XEmbedSample", "samples\XEmbedSample\XEmbedSample.csproj", "{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XEmbedSample", "samples\XEmbedSample\XEmbedSample.csproj", "{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.MacCatalyst", "samples\ControlCatalog.iOS\ControlCatalog.MacCatalyst.csproj", "{DE3C28DD-B602-4750-831D-345102A54CA0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.MacCatalyst", "samples\ControlCatalog.MacCatalyst\ControlCatalog.MacCatalyst.csproj", "{DE3C28DD-B602-4750-831D-345102A54CA0}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.tvOS", "samples\ControlCatalog.iOS\ControlCatalog.tvOS.csproj", "{14342787-B4EF-4076-8C91-BA6C523DE8DF}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.tvOS", "samples\ControlCatalog.tvOS\ControlCatalog.tvOS.csproj", "{14342787-B4EF-4076-8C91-BA6C523DE8DF}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
dirs.proj
View File

@ -9,6 +9,8 @@
<ProjectReference Remove="**/*.shproj" /> <ProjectReference Remove="**/*.shproj" />
<!-- Exclude iOS, Android and Browser samples from build --> <!-- Exclude iOS, Android and Browser samples from build -->
<ProjectReference Remove="samples/*.iOS/*.csproj" /> <ProjectReference Remove="samples/*.iOS/*.csproj" />
<ProjectReference Remove="samples/*.tvOS/*.csproj" />
<ProjectReference Remove="samples/*.MacCatalyst/*.csproj" />
<ProjectReference Remove="samples/*.Android/*.csproj" /> <ProjectReference Remove="samples/*.Android/*.csproj" />
<ProjectReference Remove="samples/*.Browser/*.csproj" /> <ProjectReference Remove="samples/*.Browser/*.csproj" />
<ProjectReference Remove="samples/*.Blazor/*.csproj" /> <ProjectReference Remove="samples/*.Blazor/*.csproj" />

19
samples/ControlCatalog.iOS/ControlCatalog.MacCatalyst.csproj → samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
View File

@ -1,19 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<ProvisioningType>manual</ProvisioningType> <ProvisioningType>manual</ProvisioningType>
<TargetFramework>$(AvsCurrentMacCatalystTargetFramework)</TargetFramework> <TargetFramework>$(AvsCurrentMacCatalystTargetFramework)</TargetFramework>
<!-- Used to support Desktop Mode Idiom, min supported version is 13.1, which supports iPad scaling. --> <!-- Used to support Desktop Mode Idiom, min supported version is 13.1, which supports iPad scaling. -->
<SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
<UseInterpreter>true</UseInterpreter>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" /> <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" /> <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
<None Include="Info.Catalyst.plist">
<LogicalName>Info.plist</LogicalName>
</None>
</ItemGroup> </ItemGroup>
<PropertyGroup>
<UseInterpreter>true</UseInterpreter> <ItemGroup>
</PropertyGroup> <Compile Include="../ControlCatalog.iOS/*.cs" />
<InterfaceDefinition Include="../ControlCatalog.iOS/Resources/*.xib" />
</ItemGroup>
</Project> </Project>

5
samples/ControlCatalog.MacCatalyst/Entitlements.plist
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

2
samples/ControlCatalog.iOS/Info.Catalyst.plist → samples/ControlCatalog.MacCatalyst/Info.plist
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>ControlCatalog.Catalyst</string> <string>ControlCatalog.MacCatalyst</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>Avalonia.ControlCatalog</string> <string>Avalonia.ControlCatalog</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

15
samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
View File

@ -1,18 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<ProvisioningType>manual</ProvisioningType> <ProvisioningType>manual</ProvisioningType>
<TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework> <TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework>
<SupportedOSPlatformVersion>$(AvsMinSupportedIOSVersion)</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>$(AvsMinSupportedIOSVersion)</SupportedOSPlatformVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" /> <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" /> <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
<None Include="Info.iOS.plist">
<LogicalName>Info.plist</LogicalName>
</None>
</ItemGroup> </ItemGroup>
<PropertyGroup>
<UseInterpreter>true</UseInterpreter> </Project>
</PropertyGroup>
</Project>

0
samples/ControlCatalog.iOS/Info.iOS.plist → samples/ControlCatalog.iOS/Info.plist
View File

19
samples/ControlCatalog.iOS/ControlCatalog.tvOS.csproj → samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj
View File

@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<ProvisioningType>manual</ProvisioningType> <ProvisioningType>manual</ProvisioningType>
@ -7,15 +8,17 @@
<!-- To run this in the simulator, you need to use the x64 architecture, <!-- To run this in the simulator, you need to use the x64 architecture,
since SkiaSharp only bundles native libraries for x64 for the tvOS Simulator --> since SkiaSharp only bundles native libraries for x64 for the tvOS Simulator -->
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">tvossimulator-x64</RuntimeIdentifier> <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">tvossimulator-x64</RuntimeIdentifier>
<UseInterpreter>true</UseInterpreter>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" /> <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" /> <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
<None Include="Info.tvOS.plist">
<LogicalName>Info.plist</LogicalName>
</None>
</ItemGroup> </ItemGroup>
<PropertyGroup>
<UseInterpreter>true</UseInterpreter> <ItemGroup>
</PropertyGroup> <Compile Include="../ControlCatalog.iOS/*.cs" />
<InterfaceDefinition Include="../ControlCatalog.iOS/Resources/*.xib" />
</ItemGroup>
</Project> </Project>

5
samples/ControlCatalog.tvOS/Entitlements.plist
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

0
samples/ControlCatalog.iOS/Info.tvOS.plist → samples/ControlCatalog.tvOS/Info.plist
View File

Write Preview
Loading…
Cancel
Save