Misc. quality improvements

FNA-XNA · Jul 1, 2023 · 4417896 · 4417896
1 parent 2270fa2
commit 4417896
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/FNA.Core.csproj b/FNA.Core.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net40;netstandard2.0;net7.0</TargetFrameworks>
-		<Platforms>x64</Platforms>
 	</PropertyGroup>
 	<PropertyGroup>
 		<EnableDefaultItems>false</EnableDefaultItems>
@@ -12,7 +11,7 @@
 	</PropertyGroup>
 	<PropertyGroup>
 		<IsPackable>true</IsPackable>
-		<Version>23.06</Version>
+		<Version>23.07</Version>
 		<Description>Accuracy-focused XNA4 reimplementation for open platforms</Description>
 		<Copyright>Copyright (c) 2009-2023</Copyright>
 		<Authors>flibitijibibo</Authors>
@@ -23,12 +22,10 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<AddAppConfigToBuildOutputs>true</AddAppConfigToBuildOutputs>
-		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.config</AllowedOutputExtensionsInPackageBuildOutputFolder>
 	</PropertyGroup>
 	<ItemGroup>
-		<_FNATargetFramework Include="$(TargetFrameworks)" />
-		<Content Include="FNA.Core.props" Pack="true" PackagePath="@(_FNATargetFramework->'buildTransitive/%(Identity)/FNA.props')" />
+		<None Include="FNA.Core.props" Pack="true" PackagePath="buildTransitive\FNA.props" />
+		<None Include="App.config" Pack="true" PackagePath="contentFiles\FNA.dll.config" />
 	</ItemGroup>
 	<PropertyGroup>
 		<FNASettingsPropsFilePath>$(SolutionDir)FNA.Settings.props</FNASettingsPropsFilePath>
@@ -387,21 +384,21 @@
 			<LogicalName>Microsoft.Xna.Framework.Graphics.Effect.Resources.YUVToRGBAEffect.fxb</LogicalName>
 		</EmbeddedResource>
 	</ItemGroup>
-	<Target Name="DownloadExpandAndPackFNALibs" BeforeTargets="DispatchToInnerBuilds">
+	<Target Name="DownloadExpandAndPackFNALibs" BeforeTargets="DispatchToInnerBuilds" Condition="'$(PackFNALibs)' == true">
 		<PropertyGroup>
-			<FNALibsRoot>$(BaseIntermediateOutputPath)fnalibs</FNALibsRoot>
+			<FNALibsRoot>$(BaseIntermediateOutputPath)fnalibs\</FNALibsRoot>
 		</PropertyGroup>
 		<DownloadFile SourceUrl="https://fna.flibitijibibo.com/archive/fnalibs.tar.bz2" DestinationFolder="$(BaseIntermediateOutputPath)">
 			<Output TaskParameter="DownloadedFile" PropertyName="FNALibsArchive" />
 		</DownloadFile>
 		<MakeDir Directories="$(FNALibsRoot)" />
 		<Exec Command="bsdtar -xjf $(FNALibsArchive) -C $(FNALibsRoot)" />
 		<ItemGroup>
-			<Content Include="$(FNALibsRoot)/x64/*.*" Pack="true" PackagePath="runtimes/win-x64/native" />
-			<Content Include="$(FNALibsRoot)/x86/*.*" Pack="true" PackagePath="runtimes/win-x86/native" />
-			<Content Include="$(FNALibsRoot)/osx/*.*" Pack="true" PackagePath="runtimes/osx-x64/native" />
-			<Content Include="$(FNALibsRoot)/lib64/*.*" Pack="true" PackagePath="runtimes/linux-x64/native" />
-			<Content Include="$(FNALibsRoot)/libaarch64/*.*" Pack="true" PackagePath="runtimes/linux-arm64/native" />
+			<None Include="$(FNALibsRoot)x64\*.*" Pack="true" PackagePath="runtimes\win-x64\native" />
+			<None Include="$(FNALibsRoot)x86\*.*" Pack="true" PackagePath="runtimes\win-x86\native" />
+			<None Include="$(FNALibsRoot)osx\*.*" Pack="true" PackagePath="runtimes\osx-x64\native" />
+			<None Include="$(FNALibsRoot)lib64\*.*" Pack="true" PackagePath="runtimes\linux-x64\native" />
+			<None Include="$(FNALibsRoot)libaarch64\*.*" Pack="true" PackagePath="runtimes\linux-arm64\native" />
 		</ItemGroup>
 	</Target>
 </Project>
diff --git a/FNA.Core.props b/FNA.Core.props
@@ -1,7 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
-		<Content Include="$(MSBuildThisFileDirectory)..\..\lib\$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Name)\FNA.dll.config" Condition="'$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe'">
+		<None Include="$(MSBuildThisFileDirectory)..\contentFiles\FNA.dll.config" Condition="'$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe'">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
+			<Visible>false</Visible>
+			<TargetPath>%(Filename)%(Extension)</TargetPath>
+		</None>
 	</ItemGroup>
 </Project>