Output all assemblies into the same folder to bring back samples working

sharpdx · Jul 11, 2018 · f555dad · f555dad
1 parent a9cb7e8
commit f555dad
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/Samples b/Samples
diff --git a/SharpDX.sln b/SharpDX.sln
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sources", "Sources", "{CC8D
 	ProjectSection(SolutionItems) = preProject
 		Source\Mapping.Direct3D1x.xml = Source\Mapping.Direct3D1x.xml
 		Source\Mapping.xml = Source\Mapping.xml
+		Source\MappingFiles.props = Source\MappingFiles.props
 		Source\SharedAssemblyInfo.cs = Source\SharedAssemblyInfo.cs
 	EndProjectSection
 EndProject
@@ -69,6 +70,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDX.Desktop", "Source\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDX.Direct3D10", "Source\SharpDX.Direct3D10\SharpDX.Direct3D10.csproj", "{618AFA87-81A8-4B1C-8876-5457D49F2DEF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{3EF31A42-4EEF-44AC-8D18-D036D080A955}"
+	ProjectSection(SolutionItems) = preProject
+		Source\Directory.build.props = Source\Directory.build.props
+		Source\Directory.build.targets = Source\Directory.build.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/SharpDX.sln.DotSettings b/SharpDX.sln.DotSettings
@@ -21,6 +21,7 @@
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_CATCH_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -82,7 +83,12 @@ THE SOFTWARE.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>

diff --git a/Source/Directory.build.props b/Source/Directory.build.props
@@ -32,6 +32,11 @@
     <SharpGenGeneratedCodeFolder Condition="'$(TargetFramework)' == 'net40'">Generated/net40_$(AppType)</SharpGenGeneratedCodeFolder>
     <SharpGenDocumentationOutputDir>$(MSBuildThisFileDirectory)</SharpGenDocumentationOutputDir>
     <SharpGenGenerateConsumerBindMapping>false</SharpGenGenerateConsumerBindMapping>
+
+    <!--Output all assemblies into the same folder for the samples and to avoid copying assembly references all around for each project-->
+    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
+    <OutputPath>$(MSBuildThisFileDirectory)..\Bin\$(Configuration)\</OutputPath>
+    <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(MSBuildThisFileDirectory)..\Bin\$(Configuration)\$(TargetFramework)\$(PackageId).xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' And Exists('$(MSBuildThisFileDirectory)/../sharpdx.snk')">
     <DefineConstants>$(DefineConstants);SHARPDX_SIGNED</DefineConstants>

diff --git a/Source/Directory.build.targets b/Source/Directory.build.targets
@@ -1,5 +1,5 @@
 <Project>
-  <Target Name="RemoveNonApplicableFiles"
+    <Target Name="RemoveNonApplicableFiles"
     Condition="'$(SharpDXLegacy)' != 'true'"
     BeforeTargets="AddGeneratedCSharpFilesToCompilation"
     AfterTargets="GenerateCSharp">

diff --git a/Source/SharpDX/SharpDX.csproj b/Source/SharpDX/SharpDX.csproj
@@ -4,11 +4,11 @@
     <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX</PackageId>
     <Product>SharpDX</Product>
-    <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.xml</DocumentationFile>
     <AssemblyTitle>SharpDX</AssemblyTitle>
     <Title>SharpDX</Title>
     <Description>Core assembly for all SharpDX assemblies.</Description>
   </PropertyGroup>
+
   <ItemGroup>
     <None Include="Mapping-core.xml" />
     <None Include="Direct3D\Mapping.xml" />
+6 −6		Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj
+5 −5		Desktop/Direct2D1/BitmapApp/BitmapApp.csproj
+6 −6		Desktop/Direct2D1/MiniRect/MiniRect.csproj
+6 −6		Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj
+4 −4		Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj
+5 −5		Desktop/Direct2D1/TessellateApp/TessellateApp.csproj
+5 −5		Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj
+6 −6		Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj
+9 −6		Desktop/Direct3D11/MiniCube/MiniCube.csproj
+6 −6		Desktop/Direct3D11/MiniTri/MiniTri.csproj
+9 −9		Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj
+6 −6		Desktop/Direct3D11/MultiCube/MultiCube.csproj
+6 −6		Desktop/Direct3D12/HelloBundles/HelloBundles.csproj
+6 −6		Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj
+6 −6		Desktop/Direct3D12/HelloTexture/HelloTexture.csproj
+6 −6		Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj
+6 −6		Desktop/Direct3D12/HelloWindow/HelloWindow.csproj
+6 −6		Desktop/Direct3D12/HelloWorld/HelloWorld.csproj
+4 −4		Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj
+4 −4		Desktop/Direct3D9/MiniCube/MiniCube.csproj
+4 −4		Desktop/Direct3D9/MiniTri/MiniTri.csproj
+6 −6		Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj
+2 −2		Desktop/DirectInput/JoystickApp/JoystickApp.csproj
+2 −2		Desktop/DirectSound/PlaySound/PlaySound.csproj
+5 −5		Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj
+5 −5		Desktop/DirectWrite/CustomFont/CustomFont.csproj
+5 −5		Desktop/DirectWrite/CustomLayout/CustomLayout.csproj
+3 −3		Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj
+5 −5		Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj
+5 −5		Desktop/DirectWrite/TextDialog/TextDialog.csproj
+2 −2		Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj
+6 −6		Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj
+2 −2		Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj
+3 −3		Desktop/WIC/EncodeDecode/EncodeDecode.csproj
+3 −3		Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj
+3 −3		Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj
+2 −2		Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj
+2 −2		Desktop/XAudio2/PlaySound/PlaySound.csproj
+2 −2		Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj
+2 −2		Desktop/XInput/XGamepadApp/XGamepadApp.csproj
+2 −2		SharpDXSamples-Desktop.sln