forked from AvaloniaUI/avalonia-dotnet-templates
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c9fa33d
commit 301b5fc
Showing
46 changed files
with
274 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...st.Android/Properties/AndroidManifest.xml → ....1.Android/Properties/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <application android:label="AvaloniaTest" android:icon="@drawable/Icon" /> | ||
| <application android:label="AvaloniaTest.1" android:icon="@drawable/Icon" /> | ||
| </manifest> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...st.Browser/Properties/launchSettings.json → ....1.Browser/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
48 changes: 24 additions & 24 deletions
48
...aTest.Desktop/AvaloniaTest.Desktop.csproj → ...t.1.Desktop/AvaloniaTest.1.Desktop.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects. | ||
| One for Windows with FrameworkParameter-windows TFM, one for MacOS with FrameworkParameter-macos and one with FrameworkParameter TFM for Linux.--> | ||
| <TargetFramework>FrameworkParameter</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <BuiltInComInteropSupport>true</BuiltInComInteropSupport> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ApplicationManifest>app.manifest</ApplicationManifest> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> | ||
| <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> | ||
| <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\AvaloniaTest\AvaloniaTest.csproj" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects. | ||
| One for Windows with FrameworkParameter-windows TFM, one for MacOS with FrameworkParameter-macos and one with FrameworkParameter TFM for Linux.--> | ||
| <TargetFramework>FrameworkParameter</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <BuiltInComInteropSupport>true</BuiltInComInteropSupport> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ApplicationManifest>app.manifest</ApplicationManifest> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> | ||
| <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> | ||
| <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\AvaloniaTest.1\AvaloniaTest.1.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
50 changes: 27 additions & 23 deletions
50
...arp/xplat/AvaloniaTest.Desktop/Program.cs → ...p/xplat/AvaloniaTest.1.Desktop/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,27 @@ | ||
| using System; | ||
| using Avalonia; | ||
| using Avalonia.ReactiveUI; | ||
|
|
||
| namespace AvaloniaTest.Desktop; | ||
|
|
||
| sealed class Program | ||
| { | ||
| // Initialization code. Don't use any Avalonia, third-party APIs or any | ||
| // SynchronizationContext-reliant code before AppMain is called: things aren't initialized | ||
| // yet and stuff might break. | ||
| [STAThread] | ||
| public static void Main(string[] args) => BuildAvaloniaApp() | ||
| .StartWithClassicDesktopLifetime(args); | ||
|
|
||
| // Avalonia configuration, don't remove; also used by visual designer. | ||
| public static AppBuilder BuildAvaloniaApp() | ||
| => AppBuilder.Configure<App>() | ||
| .UsePlatformDetect() | ||
| .WithInterFont() | ||
| .LogToTrace() | ||
| .UseReactiveUI(); | ||
| } | ||
| using System; | ||
| using Avalonia; | ||
| #if (ReactiveUIToolkitChosen) | ||
| using Avalonia.ReactiveUI; | ||
| #endif | ||
|
|
||
| namespace AvaloniaTest._1.Desktop; | ||
|
|
||
| sealed class Program | ||
| { | ||
| // Initialization code. Don't use any Avalonia, third-party APIs or any | ||
| // SynchronizationContext-reliant code before AppMain is called: things aren't initialized | ||
| // yet and stuff might break. | ||
| [STAThread] | ||
| public static void Main(string[] args) => BuildAvaloniaApp() | ||
| .StartWithClassicDesktopLifetime(args); | ||
|
|
||
| // Avalonia configuration, don't remove; also used by visual designer. | ||
| public static AppBuilder BuildAvaloniaApp() | ||
| => AppBuilder.Configure<App>() | ||
| .UsePlatformDetect() | ||
| .WithInterFont() | ||
| #if (ReactiveUIToolkitChosen) | ||
| .UseReactiveUI() | ||
| #endif | ||
| .LogToTrace(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tes/csharp/xplat/AvaloniaTest.iOS/Main.cs → ...s/csharp/xplat/AvaloniaTest.1.iOS/Main.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| using UIKit; | ||
|
|
||
| namespace AvaloniaTest.iOS; | ||
| namespace AvaloniaTest._1.iOS; | ||
|
|
||
| public class Application | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../AvaloniaTest/App.RemoveViewLocator.axaml → ...valoniaTest.1/App.RemoveViewLocator.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 14 additions & 14 deletions
28
...lates/csharp/xplat/AvaloniaTest/App.axaml → ...tes/csharp/xplat/AvaloniaTest.1/App.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <Application xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:AvaloniaTest" | ||
| x:Class="AvaloniaTest.App" | ||
| RequestedThemeVariant="Default"> | ||
| <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. --> | ||
|
|
||
| <Application.DataTemplates> | ||
| <local:ViewLocator/> | ||
| </Application.DataTemplates> | ||
|
|
||
| <Application.Styles> | ||
| <FluentTheme /> | ||
| </Application.Styles> | ||
| <Application xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:AvaloniaTest._1" | ||
| x:Class="AvaloniaTest._1.App" | ||
| RequestedThemeVariant="Default"> | ||
| <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. --> | ||
|
|
||
| <Application.DataTemplates> | ||
| <local:ViewLocator/> | ||
| </Application.DataTemplates> | ||
|
|
||
| <Application.Styles> | ||
| <FluentTheme /> | ||
| </Application.Styles> | ||
| </Application> |
Oops, something went wrong.