Updates project configs.

mntone · Jan 21, 2023 · b361aa2 · b361aa2
1 parent bd0f7f3
commit b361aa2
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 144 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -97,6 +97,10 @@ trim_trailing_whitespace = true
 charset = utf-8-bom
 end_of_line = crlf
 
-[*.{vcxproj,vcxproj.filters,wapproj,wapproj.user}]
+[*.{props,targets}]
+charset = utf-8
+end_of_line = lf
+
+[*.{csproj,vcxproj,vcxproj.filters,wapproj,wapproj.user}]
 charset = utf-8
 end_of_line = crlf
diff --git a/.gitattributes b/.gitattributes
@@ -21,6 +21,9 @@ app.manifest         text encoding=utf-8 eol=lf
 *.resw               text encoding=utf-8-bom eol=crlf
 *.xaml               text encoding=utf-8 eol=crlf
 *.sln                text encoding=utf-8-bom eol=crlf
+*.csproj             text encoding=utf-8-bom eol=lf
+*.props              text encoding=utf-8 eol=lf
+*.targets            text encoding=utf-8 eol=lf
 *.vcxproj            text encoding=utf-8 eol=crlf
 *.vcxproj.filters    text encoding=utf-8-bom eol=crlf
 packages.config      text encoding=utf-8-bom eol=crlf

diff --git a/nuget/Mntone.RWinRT.props b/nuget/Mntone.RWinRT.props
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-
-	<PropertyGroup>
-		<!-- Only do this for MSBuild versions below 16.0 as it is since done automatically -->
-		<MSBuildAllProjects Condition="'$(MSBuildToolsVersion)'&lt;='15'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-	</PropertyGroup>
-
-	<ItemDefinitionGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">
-		<ClCompile>
-			<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-		</ClCompile>
-	</ItemDefinitionGroup>
-
-</Project>
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+
+	<PropertyGroup>
+		<!-- Only do this for MSBuild versions below 16.0 as it is since done automatically -->
+		<MSBuildAllProjects Condition="'$(MSBuildToolsVersion)'&lt;='15'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+	</PropertyGroup>
+
+	<ItemDefinitionGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">
+		<ClCompile>
+			<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ClCompile>
+	</ItemDefinitionGroup>
+
+</Project>
diff --git a/nuget/Mntone.RWinRT.targets b/nuget/Mntone.RWinRT.targets
@@ -1,126 +1,130 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-
-	<PropertyGroup>
-		<MntoneResourceGenerateDefaultResources Condition="'$(MntoneResourceGenerateDefaultResources)'==''">Resources</MntoneResourceGenerateDefaultResources>
-		<MntoneResourceGenerateLineBreak Condition="'$(MntoneResourceGenerateLineBreak)'==''">LF</MntoneResourceGenerateLineBreak>
-		<MntoneResourceGenerateIndent Condition="'$(MntoneResourceGenerateIndent)'==''">Space4</MntoneResourceGenerateIndent>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">
-		<MntoneResourceGenerateImplNamespace Condition="'$(MntoneResourceGenerateImplNamespace)'==''">__impl</MntoneResourceGenerateImplNamespace>
-		<MntoneResourceGenerateFileName Condition="'$(MntoneResourceGenerateFileName)'==''">res.g.h</MntoneResourceGenerateFileName>
-		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'==''">Cpp17</MntoneResourceGenerateLanguage>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
-		<MntoneResourceGenerateImplNamespace Condition="'$(MntoneResourceGenerateImplNamespace)'==''">__Impl</MntoneResourceGenerateImplNamespace>
-		<MntoneResourceGenerateFileName Condition="'$(MntoneResourceGenerateFileName)'==''">Resources.g.cs</MntoneResourceGenerateFileName>
-		<_MntoneResourceGenerateLanguageVersion>$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))</_MntoneResourceGenerateLanguageVersion>
-		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='7'">CSharp11</MntoneResourceGenerateLanguage>
-		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='6'">CSharp10</MntoneResourceGenerateLanguage>
-		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='5'">CSharp9</MntoneResourceGenerateLanguage>
-		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'==''">CSharpLegacy</MntoneResourceGenerateLanguage>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(UsingMicrosoftNETSdk)'=='true'">
-		<DefaultLanguage Condition="'$(DefaultLanguage)'==''">en-US</DefaultLanguage>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<MntoneResourceGenerateEnabled Condition="'$(MntoneResourceGenerateEnabled)'==''">true</MntoneResourceGenerateEnabled>
-		<_MntoneResourcePackageToolsFolder>$(MSBuildThisFileDirectory)..\tools\net6\</_MntoneResourcePackageToolsFolder>
-		<_MntoneResourceCompilerExePath Condition="$(_MntoneResourceCompilerExePath)==''">$(_MntoneResourcePackageToolsFolder)RWinRT.exe</_MntoneResourceCompilerExePath>
-		<PrepareForBuildDependsOn Condition="'$(MntoneResourceGenerateEnabled)'=='true' And '$(MSBuildProjectExtension)'=='.vcxproj'">
-			$(PrepareForBuildDependsOn);
-			_MntoneResourceGenerate;
-		</PrepareForBuildDependsOn>
-		<CoreCompileDependsOn Condition="'$(MSBuildProjectExtension)'=='.csproj'">
-			_MntoneResourceSourceInclude;
-			$(CoreCompileDependsOn);
-		</CoreCompileDependsOn>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<AppxMSBuildToolsPath Condition="'$(AppxMSBuildToolsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\AppxPackage\</AppxMSBuildToolsPath>
-		<AppxMSBuildTaskAssembly Condition="'$(AppxMSBuildTaskAssembly)' == ''">$(AppxMSBuildToolsPath)Microsoft.Build.AppxPackage.dll</AppxMSBuildTaskAssembly>
-	</PropertyGroup>
-
-	<Target
-		Name="_MntoneResourcePrepareGeneration"
-		Outputs="$(MntoneResourceGeneratedFilesDir)">
-		<PropertyGroup>
-			<MntoneResourceGeneratedFilesDir Condition="'$(MntoneResourceGeneratedFilesDir)'=='' And '$(GeneratedFilesDir)'!=''">$([System.IO.Path]::GetFullPath('$(GeneratedFilesDir)'))</MntoneResourceGeneratedFilesDir>
-			<MntoneResourceGeneratedFilesDir Condition="'$(MntoneResourceGeneratedFilesDir)'==''">$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', '$(IntermediateOutputPath)', 'Generated Files'))</MntoneResourceGeneratedFilesDir>
-		</PropertyGroup>
-	</Target>
-
-	<UsingTask AssemblyFile="$(AppxMSBuildTaskAssembly)" TaskName="Microsoft.Build.AppxPackage.GetDefaultResourceLanguage" />
-
-	<!-- Gets default resource language for the package. -->
-	<Target Name="_MntoneResourceGetDefaultResourceLanguage">
-		<GetDefaultResourceLanguage
-			DefaultLanguage="$(DefaultLanguage)"
-			SourceAppxManifest="@(SourceAppxManifest)">
-			<Output TaskParameter="DefaultResourceLanguage" PropertyName="DefaultResourceLanguage" />
-		</GetDefaultResourceLanguage>
-	</Target>
-
-	<Target
-		Name="_MntoneResourceGenerate"
-		DependsOnTargets="_MntoneResourcePrepareGeneration;_MntoneResourceGetDefaultResourceLanguage">
-		<PropertyGroup>
-			<!-- Managed Dll's use the "safe" name of the project as the App Package Name -->
-			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'!='false' And '$(OutputType)'!='winmdobj'">$(TargetName)</MntoneResourceGenerateRootNamespace>
-			<!-- Winmd library targets (managed or native) use the default root namespace of the project for the App package name -->
-			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'!='false' And '$(OutputType)'=='winmdobj'">$(RootNamespace)</MntoneResourceGenerateRootNamespace>
-			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'=='false' And '$(RootNamespace)'!=''">$(RootNamespace)</MntoneResourceGenerateRootNamespace>
-			<!-- If RootNamespace is empty fall back to TargetName -->
-			<MntoneResourceGenerateRootNamespace Condition="$(MntoneResourceGenerateRootNamespace)==''">$(TargetName)</MntoneResourceGenerateRootNamespace>
-		</PropertyGroup>
-
-		<ItemGroup>
-			<_MntoneResource
-				Include="@(PRIResource)"
-				Condition="'%(PRIResource.ExcludedFromBuild)'!='true' And '%(Extension)'=='.resw'" />
-		</ItemGroup>
-
-		<PropertyGroup>
-			<_MntoneResourceContinueOnError>false</_MntoneResourceContinueOnError>
-			<_MntoneResourceExcludeParams Condition="'$(MntoneResourceExcludeResourceNames)'!=''">--exclude $(MntoneResourceExcludeResourceNames)</_MntoneResourceExcludeParams>
-			<_MntoneResourceParams Condition="'$(_MntoneResourceParams)'==''">
---input @(_MntoneResource->'"%(FullPath)"',',')
---output "$(MntoneResourceGeneratedFilesDir.TrimEnd('\'))"
-$(_MntoneResourceExcludeParams)
---filename $(MntoneResourceGenerateFileName)
---namespace $(MntoneResourceGenerateRootNamespace)
---impl-namespace $(MntoneResourceGenerateImplNamespace)
---default $(MntoneResourceGenerateDefaultResources)
---indent $(MntoneResourceGenerateIndent)
---language $(DefaultResourceLanguage)
---langver $(MntoneResourceGenerateLanguage)
---linebreak $(MntoneResourceGenerateLineBreak)
-			</_MntoneResourceParams>
-		</PropertyGroup>
-
-		<MakeDir Directories="$(MntoneResourceGeneratedFilesDir)" />
-		<Message Text="&quot;$(_MntoneResourceCompilerExePath)&quot; $(_MntoneResourceParams)" Importance="high" />
-		<Exec Command="&quot;$(_MntoneResourceCompilerExePath)&quot; $([System.String]::Copy('$(_MntoneResourceParams)').Replace('%0D',' ').Replace('%0A',' '))"  ContinueOnError="$(_MntoneResourceContinueOnError)" />
-
-		<ItemGroup Condition="Exists('$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)')">
-			<UpToDateCheckInput Include="$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)" />
-		</ItemGroup>
-	</Target>
-
-	<Target
-		Name="_MntoneResourceSourceInclude"
-		BeforeTargets="BeforeCompile;GenerateTargetFrameworkMonikerAttribute"
-		DependsOnTargets="_MntoneResourceGenerate"
-		Condition="'$(MntoneResourceGenerateEnabled)'=='true'">
-		<ItemGroup>
-			<Compile Include="$(MSBuildThisFileDirectory)..\embedded\any\ResourceManager.cs"  Exclude="@(Compile)" />
-			<Compile Include="$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)"  Exclude="@(Compile)" />
-		</ItemGroup>
-	</Target>
-
-</Project>
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+
+	<PropertyGroup>
+		<MntoneResourceGenerateDefaultResources Condition="'$(MntoneResourceGenerateDefaultResources)'==''">Resources</MntoneResourceGenerateDefaultResources>
+		<MntoneResourceGenerateIndent Condition="'$(MntoneResourceGenerateIndent)'==''">Space4</MntoneResourceGenerateIndent>
+		<MntoneResourceGenerateLineBreak Condition="'$(MntoneResourceGenerateLineBreak)'==''">LF</MntoneResourceGenerateLineBreak>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">
+		<MntoneResourceGenerateImplNamespace Condition="'$(MntoneResourceGenerateImplNamespace)'==''">__impl</MntoneResourceGenerateImplNamespace>
+		<MntoneResourceGenerateFileName Condition="'$(MntoneResourceGenerateFileName)'==''">res.g.h</MntoneResourceGenerateFileName>
+		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'==''">Cpp17</MntoneResourceGenerateLanguage>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+		<MntoneResourceGenerateImplNamespace Condition="'$(MntoneResourceGenerateImplNamespace)'==''">__Impl</MntoneResourceGenerateImplNamespace>
+		<MntoneResourceGenerateFileName Condition="'$(MntoneResourceGenerateFileName)'==''">Resources.g.cs</MntoneResourceGenerateFileName>
+		<_MntoneResourceGenerateLanguageVersion>$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))</_MntoneResourceGenerateLanguageVersion>
+		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='7'">CSharp11</MntoneResourceGenerateLanguage>
+		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='6'">CSharp10</MntoneResourceGenerateLanguage>
+		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'=='' And '$(_MntoneResourceGenerateLanguageVersion)'&gt;='5'">CSharp9</MntoneResourceGenerateLanguage>
+		<MntoneResourceGenerateLanguage Condition="'$(MntoneResourceGenerateLanguage)'==''">CSharpLegacy</MntoneResourceGenerateLanguage>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(UsingMicrosoftNETSdk)'=='true'">
+		<DefaultLanguage Condition="'$(DefaultLanguage)'==''">en-US</DefaultLanguage>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<MntoneResourceGenerateEnabled Condition="'$(MntoneResourceGenerateEnabled)'==''">true</MntoneResourceGenerateEnabled>
+		<_MntoneResourcePackageToolsFolder>$(MSBuildThisFileDirectory)..\tools\net6\</_MntoneResourcePackageToolsFolder>
+		<_MntoneResourceCompilerExePath Condition="$(_MntoneResourceCompilerExePath)==''">$(_MntoneResourcePackageToolsFolder)RWinRT.exe</_MntoneResourceCompilerExePath>
+		<PrepareForBuildDependsOn Condition="'$(MntoneResourceGenerateEnabled)'=='true' And '$(MSBuildProjectExtension)'=='.vcxproj'">
+			$(PrepareForBuildDependsOn);
+			_MntoneResourceGenerate;
+		</PrepareForBuildDependsOn>
+		<CoreCompileDependsOn Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+			_MntoneResourceSourceInclude;
+			$(CoreCompileDependsOn);
+		</CoreCompileDependsOn>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<AppxMSBuildToolsPath Condition="'$(AppxMSBuildToolsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\AppxPackage\</AppxMSBuildToolsPath>
+		<AppxMSBuildTaskAssembly Condition="'$(AppxMSBuildTaskAssembly)' == ''">$(AppxMSBuildToolsPath)Microsoft.Build.AppxPackage.dll</AppxMSBuildTaskAssembly>
+	</PropertyGroup>
+
+	<Target
+		Name="_MntoneResourcePrepareGeneration"
+		Outputs="$(MntoneResourceGeneratedFilesDir)">
+		<PropertyGroup>
+			<MntoneResourceGeneratedFilesDir Condition="'$(MntoneResourceGeneratedFilesDir)'=='' And '$(GeneratedFilesDir)'!=''">$([System.IO.Path]::GetFullPath('$(GeneratedFilesDir)'))</MntoneResourceGeneratedFilesDir>
+			<MntoneResourceGeneratedFilesDir Condition="'$(MntoneResourceGeneratedFilesDir)'==''">$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', '$(IntermediateOutputPath)', 'Generated Files'))</MntoneResourceGeneratedFilesDir>
+		</PropertyGroup>
+	</Target>
+
+	<UsingTask AssemblyFile="$(AppxMSBuildTaskAssembly)" TaskName="Microsoft.Build.AppxPackage.GetDefaultResourceLanguage" />
+
+	<!-- Gets default resource language for the package. -->
+	<Target Name="_MntoneResourceGetDefaultResourceLanguage">
+		<GetDefaultResourceLanguage
+			DefaultLanguage="$(DefaultLanguage)"
+			SourceAppxManifest="@(SourceAppxManifest)">
+			<Output TaskParameter="DefaultResourceLanguage" PropertyName="DefaultResourceLanguage" />
+		</GetDefaultResourceLanguage>
+	</Target>
+
+	<Target
+		Name="_MntoneResourceGenerate"
+		DependsOnTargets="_MntoneResourcePrepareGeneration;_MntoneResourceGetDefaultResourceLanguage">
+		<PropertyGroup>
+			<!-- Managed Dll's use the "safe" name of the project as the App Package Name -->
+			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'!='false' And '$(OutputType)'!='winmdobj'">$(TargetName)</MntoneResourceGenerateRootNamespace>
+			<!-- Winmd library targets (managed or native) use the default root namespace of the project for the App package name -->
+			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'!='false' And '$(OutputType)'=='winmdobj'">$(RootNamespace)</MntoneResourceGenerateRootNamespace>
+			<MntoneResourceGenerateRootNamespace Condition="'$(ManagedAssembly)'=='false' And '$(RootNamespace)'!=''">$(RootNamespace)</MntoneResourceGenerateRootNamespace>
+			<!-- If RootNamespace is empty fall back to TargetName -->
+			<MntoneResourceGenerateRootNamespace Condition="$(MntoneResourceGenerateRootNamespace)==''">$(TargetName)</MntoneResourceGenerateRootNamespace>
+		</PropertyGroup>
+
+		<ItemGroup>
+			<_MntoneResource
+				Include="@(PRIResource)"
+				Condition="'%(PRIResource.ExcludedFromBuild)'!='true' And '%(Extension)'=='.resw'" />
+		</ItemGroup>
+
+		<PropertyGroup>
+			<_MntoneResourceContinueOnError>false</_MntoneResourceContinueOnError>
+			<_MntoneResourceExcludeParams Condition="'$(MntoneResourceExcludeResourceNames)'!=''">--exclude $(MntoneResourceExcludeResourceNames)</_MntoneResourceExcludeParams>
+			<_MntoneResourceModeParams Condition="'$(MntoneResourceGenerateMode)'!=''">--mode $(MntoneResourceGenerateMode)</_MntoneResourceModeParams>
+			<_MntoneResourcePublicParams Condition="'$(MntoneResourcePublic)'=='true'">--public</_MntoneResourcePublicParams>
+			<_MntoneResourceParams Condition="'$(_MntoneResourceParams)'==''">
+--input @(_MntoneResource->'"%(FullPath)"',',')
+--output "$(MntoneResourceGeneratedFilesDir.TrimEnd('\'))"
+$(_MntoneResourceExcludeParams)
+--filename $(MntoneResourceGenerateFileName)
+--namespace $(MntoneResourceGenerateRootNamespace)
+--impl-namespace $(MntoneResourceGenerateImplNamespace)
+--default $(MntoneResourceGenerateDefaultResources)
+--indent $(MntoneResourceGenerateIndent)
+--language $(DefaultResourceLanguage)
+--langver $(MntoneResourceGenerateLanguage)
+--linebreak $(MntoneResourceGenerateLineBreak)
+$(_MntoneResourceModeParams)
+$(_MntoneResourcePublicParams)
+			</_MntoneResourceParams>
+		</PropertyGroup>
+
+		<MakeDir Directories="$(MntoneResourceGeneratedFilesDir)" />
+		<Message Text="&quot;$(_MntoneResourceCompilerExePath)&quot; $(_MntoneResourceParams)" Importance="high" />
+		<Exec Command="&quot;$(_MntoneResourceCompilerExePath)&quot; $([System.String]::Copy('$(_MntoneResourceParams)').Replace('%0D',' ').Replace('%0A',' '))"  ContinueOnError="$(_MntoneResourceContinueOnError)" />
+
+		<ItemGroup Condition="Exists('$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)')">
+			<UpToDateCheckInput Include="$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)" />
+		</ItemGroup>
+	</Target>
+
+	<Target
+		Name="_MntoneResourceSourceInclude"
+		BeforeTargets="BeforeCompile;GenerateTargetFrameworkMonikerAttribute"
+		DependsOnTargets="_MntoneResourceGenerate"
+		Condition="'$(MntoneResourceGenerateEnabled)'=='true'">
+		<ItemGroup>
+			<Compile Include="$(MSBuildThisFileDirectory)..\embedded\any\ResourceManager.cs"  Exclude="@(Compile)" />
+			<Compile Include="$(MntoneResourceGeneratedFilesDir)$(MntoneResourceGenerateFileName)"  Exclude="@(Compile)" />
+		</ItemGroup>
+	</Target>
+
+</Project>
diff --git a/nuget/build.cmd b/nuget/build.cmd
@@ -18,7 +18,7 @@ goto MAIN
 		echo +-------------------------------------------
 		echo ^| Build %%f
 		echo +-------------------------------------------
-		"%MSBUILD%" "%SOLUTION_FILE%" -fl -flp:logfile=msbuild_projection.log -m -t:"%%f":Clean;"%%f":Rebuild -p:Configuration=%TARGET_CONFIGURATION%;Platform=x86
+		"%MSBUILD%" "%SOLUTION_FILE%" -fl -flp:logfile=msbuild_rwinrt.log -m -t:"%%f":Clean;"%%f":Rebuild -p:Configuration=%TARGET_CONFIGURATION%;Platform=x86
 		if errorlevel 1 goto ERROR
 		if "%CLEAN_AFTER_BUILD%" == "true" (
 			rd /s /q "../obj/%TARGET_CONFIGURATION%/%%f"

diff --git a/src/Options.cs b/src/Options.cs
@@ -42,7 +42,7 @@ public sealed class Options
 		[Option("mode", Default = int.MaxValue, HelpText = "Output mode (Generator version).")]
 		public int Mode { get; set; }
 
-		[Option("public", Default = false, HelpText = "Accessor level is public (C# only).")]
+		[Option('p', "public", Default = false, HelpText = "Accessor level is public (C# only).")]
 		public bool IsPublic { get; set; }
 	}
 }