Skip to content

Commit

Permalink
Rename project to avoid microsoft/microsoft-ui-xaml#7059
Browse files Browse the repository at this point in the history
  • Loading branch information
MartyIX committed Dec 10, 2023
1 parent ce49ab9 commit da21a82
Show file tree
Hide file tree
Showing 17 changed files with 56 additions and 24 deletions.
4 changes: 2 additions & 2 deletions App.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiRepro202312PointerPressedRelative"
x:Class="MauiRepro202312PointerPressedRelative.App">
xmlns:local="clr-namespace:MauiPointerPressedRelative"
x:Class="MauiPointerPressedRelative.App">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
Expand Down
2 changes: 1 addition & 1 deletion App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

public partial class App : Application
{
Expand Down
6 changes: 3 additions & 3 deletions AppShell.xaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="MauiRepro202312PointerPressedRelative.AppShell"
x:Class="MauiPointerPressedRelative.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiRepro202312PointerPressedRelative"
xmlns:local="clr-namespace:MauiPointerPressedRelative"
Shell.FlyoutBehavior="Disabled"
Title="MauiRepro202312PointerPressedRelative">
Title="MauiPointerPressedRelative">

<ShellContent
Title="Home"
Expand Down
2 changes: 1 addition & 1 deletion AppShell.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

public partial class AppShell : Shell
{
Expand Down
2 changes: 1 addition & 1 deletion MauiProgram.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

public static class MauiProgram
{
Expand Down
15 changes: 10 additions & 5 deletions MauiRepro202312PointerPressedRelative.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<MauiVersion>8.0.3</MauiVersion>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
Expand All @@ -14,17 +18,18 @@
<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->

<OutputType>Exe</OutputType>
<RootNamespace>MauiRepro202312PointerPressedRelative</RootNamespace>
<RootNamespace>MauiPointerPressedRelative</RootNamespace>
<UseMaui>true</UseMaui>
<UseMauiNuGets>true</UseMauiNuGets>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<!-- Display name -->
<ApplicationTitle>MauiRepro202312PointerPressedRelative</ApplicationTitle>
<ApplicationTitle>MauiPointerPressedRelative</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.mauirepro202312pointerpressedrelative</ApplicationId>
<ApplicationId>com.companyname.mauiPointerPressedRelative</ApplicationId>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
Expand Down
27 changes: 27 additions & 0 deletions MauiRepro202312PointerPressedRelative.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34321.82
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiRepro202312PointerPressedRelative", "MauiRepro202312PointerPressedRelative.csproj", "{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Release|Any CPU.Build.0 = Debug|Any CPU
{1DBB4C58-0383-4CFB-99E4-18E7CC7D00AB}.Release|Any CPU.Deploy.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FB41A82A-B3FD-4B25-AFD2-947451E588C2}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Platforms/Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Android.Content.PM;
using Android.OS;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
public class MainActivity : MauiAppCompatActivity
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Android/MainApplication.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Android.App;
using Android.Runtime;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

[Application]
public class MainApplication : MauiApplication
Expand Down
2 changes: 1 addition & 1 deletion Platforms/MacCatalyst/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Foundation;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate
Expand Down
2 changes: 1 addition & 1 deletion Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ObjCRuntime;
using UIKit;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

public class Program
{
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Tizen/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.Maui;
using Microsoft.Maui.Hosting;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

class Program : MauiApplication
{
Expand Down
4 changes: 2 additions & 2 deletions Platforms/Windows/App.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<maui:MauiWinUIApplication
x:Class="MauiRepro202312PointerPressedRelative.WinUI.App"
x:Class="MauiPointerPressedRelative.WinUI.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:maui="using:Microsoft.Maui"
xmlns:local="using:MauiRepro202312PointerPressedRelative.WinUI">
xmlns:local="using:MauiPointerPressedRelative.WinUI">

</maui:MauiWinUIApplication>
2 changes: 1 addition & 1 deletion Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace MauiRepro202312PointerPressedRelative.WinUI;
namespace MauiPointerPressedRelative.WinUI;

/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Windows/app.manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MauiRepro202312PointerPressedRelative.WinUI.app"/>
<assemblyIdentity version="1.0.0.0" name="MauiPointerPressedRelative.WinUI.app"/>

<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Foundation;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate
Expand Down
2 changes: 1 addition & 1 deletion Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ObjCRuntime;
using UIKit;

namespace MauiRepro202312PointerPressedRelative;
namespace MauiPointerPressedRelative;

public class Program
{
Expand Down

0 comments on commit da21a82

Please sign in to comment.