Merge pull request #4 from lahm86/issue-3-sdkformat

#3 SDK Format
lahm86 · Mar 10, 2023 · 8362cc2 · 8362cc2
2 parents dc83f83 + 392da98
commit 8362cc2
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 697 deletions.
diff --git a/RectanglePacker/Properties/AssemblyInfo.cs b/RectanglePacker/Properties/AssemblyInfo.cs
diff --git a/RectanglePacker/RectanglePacker.csproj b/RectanglePacker/RectanglePacker.csproj
@@ -1,68 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AA641810-6DC5-40F7-B3BC-C7A15502C82A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RectanglePacker</RootNamespace>
-    <AssemblyName>RectanglePacker</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <TargetFramework>net472</TargetFramework>
     <WarningLevel>4</WarningLevel>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Version>1.0.0</Version>
+    <Product>RectanglePacker Core Library</Product>
+    <Copyright>Copyright © Tomb Raider Community 2023</Copyright>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Comparison\AreaComparer.cs" />
-    <Compile Include="Comparison\HeightComparer.cs" />
-    <Compile Include="Comparison\PerimiterComparer.cs" />
-    <Compile Include="Comparison\SquareComparer.cs" />
-    <Compile Include="Comparison\WidthComparer.cs" />
-    <Compile Include="Defaults\DefaultPacker.cs" />
-    <Compile Include="Defaults\DefaultRectangle.cs" />
-    <Compile Include="Defaults\OccupiedRegion.cs" />
-    <Compile Include="ITile.cs" />
-    <Compile Include="AbstractPacker.cs" />
-    <Compile Include="Events\PackingResult.cs" />
-    <Compile Include="Organisation\PackingFillMode.cs" />
-    <Compile Include="Organisation\PackingGroupMode.cs" />
-    <Compile Include="Organisation\PackingOptions.cs" />
-    <Compile Include="Organisation\PackingOrderMode.cs" />
-    <Compile Include="Organisation\PackingOrder.cs" />
-    <Compile Include="Events\RectanglePositionEventArgs.cs" />
-    <Compile Include="Defaults\DefaultTile.cs" />
-    <Compile Include="IRectangle.cs" />
-    <Compile Include="Organisation\PackingStartMethod.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/RectanglePackerSample/Properties/AssemblyInfo.cs b/RectanglePackerSample/Properties/AssemblyInfo.cs
diff --git a/RectanglePackerSample/RectanglePackerSample.csproj b/RectanglePackerSample/RectanglePackerSample.csproj
@@ -1,74 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8671BBA1-D91C-4AA6-B8E9-8C411AF0B637}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>RectanglePackerSample</RootNamespace>
-    <AssemblyName>RectanglePackerSample</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <TargetFramework>net472</TargetFramework>
     <WarningLevel>4</WarningLevel>
+    <OutputType>Exe</OutputType>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Version>1.0.0</Version>
+    <Product>RectanglePacker Sample</Product>
+    <Copyright>Copyright © Tomb Raider Community 2023</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PackerSample.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-    <None Include="SampleRectangles.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="SampleRectangles2.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="SampleSizes.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\RectanglePacker\RectanglePacker.csproj">
-      <Project>{aa641810-6dc5-40f7-b3bc-c7a15502c82a}</Project>
-      <Name>RectanglePacker</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\RectanglePacker\RectanglePacker.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/RectanglePackerSample/packages.config b/RectanglePackerSample/packages.config
diff --git a/RectanglePackerWindow/App.xaml.cs b/RectanglePackerWindow/App.xaml.cs
@@ -20,21 +20,7 @@ public App()
             Assembly assembly = Assembly.GetExecutingAssembly();
             Version v = assembly.GetName().Version;
             Version = string.Format("{0}.{1}.{2}", v.Major, v.Minor, v.Build);
-
-            object[] attributes = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
-            if (attributes.Length > 0)
-            {
-                TaggedVersion = ((AssemblyProductAttribute)attributes[0]).Product.Trim();
-                if (TaggedVersion.Contains(" "))
-                {
-                    string[] tagArr = TaggedVersion.Split(' ');
-                    TaggedVersion = tagArr[tagArr.Length - 1];
-                }
-            }
-            else
-            {
-                TaggedVersion = "v" + Version;
-            }
+            TaggedVersion = "V" + Version;
         }
     }
 }
diff --git a/RectanglePackerWindow/Properties/AssemblyInfo.cs b/RectanglePackerWindow/Properties/AssemblyInfo.cs
diff --git a/RectanglePackerWindow/Properties/Resources.Designer.cs b/RectanglePackerWindow/Properties/Resources.Designer.cs