Aligned output path for Android, iOS and macOS, removed root namespac…

…e from projects as it is added from props
xperiandri · Jun 23, 2021 · 4deaf14 · 4deaf14
1 parent 94a0631
commit 4deaf14
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 18 deletions.
diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Gtk/SolutionTemplate.Skia.Gtk.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Gtk/SolutionTemplate.Skia.Gtk.csproj
@@ -7,7 +7,6 @@
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
     <LangVersion>9.0</LangVersion>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/...Templates/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj b/...Templates/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj
@@ -8,7 +8,6 @@
     <TargetFramework>tizen50</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/...tes/SolutionTemplate/SolutionTemplate.Skia.Wpf.Host/SolutionTemplate.Skia.Wpf.Host.csproj b/...tes/SolutionTemplate/SolutionTemplate.Skia.Wpf.Host/SolutionTemplate.Skia.Wpf.Host.csproj
@@ -9,7 +9,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <RootNamespace>$(AssemblyBaseName).WPF.Host</RootNamespace>
+    <RootNamespace>$(RootNamespace).WPF.Host</RootNamespace>
     <AssemblyName>$(AssemblyBaseName).App</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/SolutionTemplate.Skia.Wpf.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/SolutionTemplate.Skia.Wpf.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <LangVersion>9.0</LangVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj
@@ -29,8 +29,7 @@
     <OutputType>AppContainerExe</OutputType>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SolutionTemplate</RootNamespace>
-    <AssemblyName>$(AssemblyBaseName).UWP</AssemblyName>
+    <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Wasm/SolutionTemplate.Wasm.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Wasm/SolutionTemplate.Wasm.csproj
@@ -7,7 +7,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <!-- .editorcofig bases suppressions do not work in WASM for some unknown reasons -->
     <NoWarn>NU1701;DF0033</NoWarn>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj
@@ -9,10 +9,10 @@
     <ProjectGuid>{C306819D-C046-4130-B9EF-68546B2CFBA4}</ProjectGuid>
     <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <ResourcesDirectory>..\SolutionTemplate.Shared\Strings</ResourcesDirectory>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <UnoSourceGeneratorCaptureGenerationHostOutput>true</UnoSourceGeneratorCaptureGenerationHostOutput>
     <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
@@ -23,7 +23,6 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -36,7 +35,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -50,7 +48,6 @@
     <DebugType>full</DebugType>
     <IOSDebugOverWiFi>true</IOSDebugOverWiFi>
     <Optimize>false</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -65,7 +62,6 @@
     <DebugType>none</DebugType>
     <IOSDebugOverWiFi>true</IOSDebugOverWiFi>
     <Optimize>true</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -85,7 +81,6 @@
     <DebugType>none</DebugType>
     <IOSDebugOverWiFi>true</IOSDebugOverWiFi>
     <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
@@ -99,7 +94,6 @@
     <DebugType>none</DebugType>
     <IOSDebugOverWiFi>true</IOSDebugOverWiFi>
     <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\AppStore</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj
@@ -10,16 +10,15 @@
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <OutputType>Exe</OutputType>
-    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -44,7 +43,6 @@
     <DebugSymbols>false</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <ErrorReport>prompt</ErrorReport>