Misc: modernize project & bump .net versions

Piotrekol · May 20, 2019 · 9f695f9 · 9f695f9
1 parent 78ad2c6
commit 9f695f9
Show file tree

Hide file tree

Showing 29 changed files with 258 additions and 1,263 deletions.
diff --git a/App/App.csproj b/App/App.csproj
@@ -1,171 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" 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>{F87A0F61-B6F3-4B5E-8A1A-C19C8C8FEAA4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>App</RootNamespace>
-    <AssemblyName>App</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </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>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net472</TargetFramework>
+    <AssemblyTitle>osu! Collections Manager by Piotrekol</AssemblyTitle>
+    <Product>Gui</Product>
+    <Copyright>Copyright ©  2017</Copyright>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <FileVersion>1.1.0</FileVersion>
+    <PreBuildEvent />
+    <PreBuildEvent />
+    <PreBuildEvent />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote Debug|AnyCPU'">
-    <OutputPath>bin\Remote Debug\</OutputPath>
-    <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="ILMerge" Version="2.13.0307" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MusicPlayer\NAudio\NAudio.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeatmapListingActionsHandler.cs" />
-    <Compile Include="CollectionEditor.cs" />
-    <Compile Include="GuiActionsHandler.cs" />
-    <Compile Include="Initalizer.cs" />
-    <Compile Include="Interfaces\Controls\IBeatmapThumbnailModel.cs" />
-    <Compile Include="Interfaces\Controls\ICollectionAddRenameModel.cs" />
-    <Compile Include="Interfaces\Controls\ICollectionTextModel.cs" />
-    <Compile Include="Interfaces\Controls\ICombinedBeatmapPreviewModel.cs" />
-    <Compile Include="Interfaces\Controls\IDownloadManagerModel.cs" />
-    <Compile Include="Interfaces\Controls\IInfoTextModel.cs" />
-    <Compile Include="Interfaces\Controls\IMusicControlModel.cs" />
-    <Compile Include="Interfaces\Controls\IBeatmapListingPresenter.cs" />
-    <Compile Include="Interfaces\Controls\IBeatmapListingModel.cs" />
-    <Compile Include="Interfaces\Controls\ICollectionListingModel.cs" />
-    <Compile Include="Interfaces\Controls\IUsernameGeneratorModel.cs" />
-    <Compile Include="Interfaces\Controls\IUserTopGeneratorModel.cs" />
-    <Compile Include="Interfaces\Forms\IMainFormModel.cs" />
-    <Compile Include="Interfaces\IBeatmapListingBindingProvider.cs" />
-    <Compile Include="Interfaces\IFormEvents.cs" />
-    <Compile Include="Interfaces\IGenericMapSetterModel.cs" />
-    <Compile Include="Interfaces\IUpdateModel.cs" />
-    <Compile Include="Misc\BeatmapListFilter.cs" />
-    <Compile Include="Misc\Helpers.cs" />
-    <Compile Include="Misc\GuiComponentsProvider.cs" />
-    <Compile Include="Models\Controls\BeatmapListingModel.cs" />
-    <Compile Include="Models\Controls\BeatmapThumbnailModel.cs" />
-    <Compile Include="Models\Controls\CollectionListingModel.cs" />
-    <Compile Include="Models\Controls\CollectionRenameModel.cs" />
-    <Compile Include="Models\Controls\CollectionTextModel.cs" />
-    <Compile Include="Models\Controls\CombinedBeatmapPreviewModel.cs" />
-    <Compile Include="Models\Controls\DownloadManagerModel.cs" />
-    <Compile Include="Models\Controls\InfoTextModel.cs" />
-    <Compile Include="Models\Controls\MusicControlModel.cs" />
-    <Compile Include="Models\Controls\UsernameGeneratorModel.cs" />
-    <Compile Include="Models\Controls\UserTopGeneratorModel.cs" />
-    <Compile Include="Models\Forms\MainFormModel.cs" />
-    <Compile Include="Models\GenericMapSetterModel.cs" />
-    <Compile Include="OsuDownloadManager.cs" />
-    <Compile Include="Presenters\Controls\BeatmapThumbnailPresenter.cs" />
-    <Compile Include="Presenters\Controls\CollectionAddRenamePresenter.cs" />
-    <Compile Include="Presenters\Controls\CollectionTextPresenter.cs" />
-    <Compile Include="Presenters\Controls\CombinedBeatmapPreviewPresenter.cs" />
-    <Compile Include="Presenters\Controls\DownloadManagerPresenter.cs" />
-    <Compile Include="Presenters\Controls\InfoTextPresenter.cs" />
-    <Compile Include="Presenters\Controls\MusicControlPresenter.cs" />
-    <Compile Include="Presenters\Controls\UsernameGeneratorPresenter.cs" />
-    <Compile Include="Presenters\Controls\UserTopGeneratorPresenter.cs" />
-    <Compile Include="Presenters\Forms\BeatmapListingFormPresenter.cs" />
-    <Compile Include="Presenters\Forms\CollectionAddRenameFormPresenter.cs" />
-    <Compile Include="Presenters\Forms\DownloadManagerFormPresenter.cs" />
-    <Compile Include="Presenters\Forms\MainFormPresenter.cs" />
-    <Compile Include="Presenters\Controls\BeatmapListingPresenter.cs" />
-    <Compile Include="Presenters\Controls\CollectionListingPresenter.cs" />
-    <Compile Include="Presenters\Controls\CombinedListingPresenter.cs" />
-    <Compile Include="Presenters\Forms\UserTopGeneratorFormPresenter.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SidePanelActionsHandler.cs" />
-    <Compile Include="UpdateChecker.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
+    <Compile Update="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CollectionManagerDll\CollectionManagerDll.csproj">
-      <Project>{533ab47a-d1b5-45db-a37e-f053fa3699c4}</Project>
-      <Name>CollectionManagerDll</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CollectionManagerExtensionsDll\CollectionManagerExtensionsDll.csproj">
-      <Project>{2bdf5d5f-1cb0-47a6-8138-e4db961740f2}</Project>
-      <Name>CollectionManagerExtensionsDll</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{14768636-102a-4a27-ab5a-9b5d1ba316a6}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GuiComponents\GuiComponents.csproj">
-      <Project>{9f6c4bfe-5696-4513-bb06-90dc14a56ccf}</Project>
-      <Name>GuiComponents</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MusicPlayer\MusicPlayer.csproj">
-      <Project>{573a1557-c916-4abe-bd52-94760d19cc29}</Project>
-      <Name>MusicPlayer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ObjectListView\ObjectListView2012.csproj">
-      <Project>{18FEDA0C-D147-4286-B39A-01204808106A}</Project>
-      <Name>ObjectListView2012</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\CollectionManagerDll\CollectionManagerDll.csproj" />
+    <ProjectReference Include="..\CollectionManagerExtensionsDll\CollectionManagerExtensionsDll.csproj" />
+    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\GuiComponents\GuiComponents.csproj" />
+    <ProjectReference Include="..\MusicPlayer\MusicPlayer.csproj" />
+    <ProjectReference Include="..\ObjectListView\ObjectListView2012.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/App/Properties/AssemblyInfo.cs b/App/Properties/AssemblyInfo.cs
@@ -1,34 +1,10 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("osu! Collections Manager by Piotrekol")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Gui")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("f87a0f61-b6f3-4b5e-8a1a-c19c8c8feaa4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.*")]
diff --git a/App/Properties/Resources.Designer.cs b/App/Properties/Resources.Designer.cs
diff --git a/App/Properties/Settings.Designer.cs b/App/Properties/Settings.Designer.cs
diff --git a/App/app.config b/App/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
diff --git a/App/packages.config b/App/packages.config
diff --git a/CollectionGenerator/App.config b/CollectionGenerator/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/CollectionGenerator/CollectionGenerator.csproj b/CollectionGenerator/CollectionGenerator.csproj
@@ -1,70 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" 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>{3070A7AA-7493-42A7-9E0E-74878453ABB4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CollectionGenerator</RootNamespace>
-    <AssemblyName>CollectionGenerator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net472</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AssemblyTitle>CollectionGenerator</AssemblyTitle>
+    <Product>CollectionGenerator</Product>
+    <Copyright>Copyright ©  2017</Copyright>
   </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>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <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="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.*" />
+    <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CollectionManagerDll\CollectionManagerDll.csproj">
-      <Project>{533ab47a-d1b5-45db-a37e-f053fa3699c4}</Project>
-      <Name>CollectionManagerDll</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CollectionManagerExtensionsDll\CollectionManagerExtensionsDll.csproj">
-      <Project>{2bdf5d5f-1cb0-47a6-8138-e4db961740f2}</Project>
-      <Name>CollectionManagerExtensionsDll</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\CollectionManagerDll\CollectionManagerDll.csproj" />
+    <ProjectReference Include="..\CollectionManagerExtensionsDll\CollectionManagerExtensionsDll.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/CollectionGenerator/Properties/AssemblyInfo.cs b/CollectionGenerator/Properties/AssemblyInfo.cs
@@ -2,35 +2,10 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CollectionGenerator")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CollectionGenerator")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("3070a7aa-7493-42a7-9e0e-74878453abb4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]