Skip to content

Commit 8362cc2

Browse files
lahm86lahm86
authored
Merge pull request #4 from lahm86/issue-3-sdkformat
#3 SDK Format
2 parents dc83f83 + 392da98 commit 8362cc2

15 files changed

Lines changed: 50 additions & 697 deletions

‎RectanglePacker/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎RectanglePacker/RectanglePacker.csproj‎

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{AA641810-6DC5-40F7-B3BC-C7A15502C82A}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>RectanglePacker</RootNamespace>
11-
<AssemblyName>RectanglePacker</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
3+
<TargetFramework>net472</TargetFramework>
314
<WarningLevel>4</WarningLevel>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
6+
<Version>1.0.0</Version>
7+
<Product>RectanglePacker Core Library</Product>
8+
<Copyright>Copyright © Tomb Raider Community 2023</Copyright>
329
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="System" />
35-
<Reference Include="System.Core" />
36-
<Reference Include="System.Drawing" />
37-
<Reference Include="System.Xml.Linq" />
38-
<Reference Include="System.Data.DataSetExtensions" />
39-
<Reference Include="Microsoft.CSharp" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Net.Http" />
42-
<Reference Include="System.Xml" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="Comparison\AreaComparer.cs" />
46-
<Compile Include="Comparison\HeightComparer.cs" />
47-
<Compile Include="Comparison\PerimiterComparer.cs" />
48-
<Compile Include="Comparison\SquareComparer.cs" />
49-
<Compile Include="Comparison\WidthComparer.cs" />
50-
<Compile Include="Defaults\DefaultPacker.cs" />
51-
<Compile Include="Defaults\DefaultRectangle.cs" />
52-
<Compile Include="Defaults\OccupiedRegion.cs" />
53-
<Compile Include="ITile.cs" />
54-
<Compile Include="AbstractPacker.cs" />
55-
<Compile Include="Events\PackingResult.cs" />
56-
<Compile Include="Organisation\PackingFillMode.cs" />
57-
<Compile Include="Organisation\PackingGroupMode.cs" />
58-
<Compile Include="Organisation\PackingOptions.cs" />
59-
<Compile Include="Organisation\PackingOrderMode.cs" />
60-
<Compile Include="Organisation\PackingOrder.cs" />
61-
<Compile Include="Events\RectanglePositionEventArgs.cs" />
62-
<Compile Include="Defaults\DefaultTile.cs" />
63-
<Compile Include="IRectangle.cs" />
64-
<Compile Include="Organisation\PackingStartMethod.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
66-
</ItemGroup>
67-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
68-
</Project>
10+
</Project>

‎RectanglePackerSample/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎RectanglePackerSample/RectanglePackerSample.csproj‎

Lines changed: 10 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8671BBA1-D91C-4AA6-B8E9-8C411AF0B637}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<RootNamespace>RectanglePackerSample</RootNamespace>
10-
<AssemblyName>RectanglePackerSample</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
3+
<TargetFramework>net472</TargetFramework>
334
<WarningLevel>4</WarningLevel>
5+
<OutputType>Exe</OutputType>
6+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
7+
<Version>1.0.0</Version>
8+
<Product>RectanglePacker Sample</Product>
9+
<Copyright>Copyright © Tomb Raider Community 2023</Copyright>
3410
</PropertyGroup>
3511
<ItemGroup>
36-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
38-
</Reference>
39-
<Reference Include="System" />
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Drawing" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="PackerSample.cs" />
51-
<Compile Include="Program.cs" />
52-
<Compile Include="Properties\AssemblyInfo.cs" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<None Include="App.config" />
56-
<None Include="packages.config" />
57-
<None Include="SampleRectangles.json">
58-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59-
</None>
60-
<None Include="SampleRectangles2.json">
61-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
62-
</None>
63-
<None Include="SampleSizes.json">
64-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
65-
</None>
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
6613
</ItemGroup>
6714
<ItemGroup>
68-
<ProjectReference Include="..\RectanglePacker\RectanglePacker.csproj">
69-
<Project>{aa641810-6dc5-40f7-b3bc-c7a15502c82a}</Project>
70-
<Name>RectanglePacker</Name>
71-
</ProjectReference>
15+
<ProjectReference Include="..\RectanglePacker\RectanglePacker.csproj" />
7216
</ItemGroup>
73-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
74-
</Project>
17+
</Project>

‎RectanglePackerSample/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎RectanglePackerWindow/App.xaml.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,7 @@ public App()
2020
Assembly assembly = Assembly.GetExecutingAssembly();
2121
Version v = assembly.GetName().Version;
2222
Version = string.Format("{0}.{1}.{2}", v.Major, v.Minor, v.Build);
23-
24-
object[] attributes = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
25-
if (attributes.Length > 0)
26-
{
27-
TaggedVersion = ((AssemblyProductAttribute)attributes[0]).Product.Trim();
28-
if (TaggedVersion.Contains(" "))
29-
{
30-
string[] tagArr = TaggedVersion.Split(' ');
31-
TaggedVersion = tagArr[tagArr.Length - 1];
32-
}
33-
}
34-
else
35-
{
36-
TaggedVersion = "v" + Version;
37-
}
23+
TaggedVersion = "V" + Version;
3824
}
3925
}
4026
}

‎RectanglePackerWindow/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎RectanglePackerWindow/Properties/Resources.Designer.cs‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)