Updated the build system, now using .NET Framework v4.0 for most things

CUETools.Codecs.BDLPCM/BDLPCMReader.cs

@@ -462,102 +462,102 @@ namespace CUETools.Codecs.BDLPCM
             }
         }
 
-        unsafe void BdHeader(TsStream s, FrameReader fr)
+        unsafe void BdHeader(TsStream s, FrameReader fr)
         {
             uint h = fr.read_uint();
             int pi_channels;
             int pi_channels_padding;
             int pi_bits;
             int pi_rate;
-
-            switch( ( h & 0xf000) >> 12 )
-            {
-            case 1:
-                pi_channels = 1;
-                break;
-            case 3:
-                pi_channels = 2;
-                break;
-            case 4:
+
+            switch( ( h & 0xf000) >> 12 )
+            {
+            case 1:
+                pi_channels = 1;
+                break;
+            case 3:
+                pi_channels = 2;
+                break;
+            case 4:
                 pi_channels = 3;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
                 //  AOUT_CHAN_CENTER, 0 };
-                break;
-            case 5:
-                pi_channels = 3;
+                break;
+            case 5:
+                pi_channels = 3;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
                 //  AOUT_CHAN_REARCENTER, 0 };
-                break;
-            case 6:
-                pi_channels = 4;
+                break;
+            case 6:
+                pi_channels = 4;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
                 //  AOUT_CHAN_CENTER, AOUT_CHAN_REARCENTER, 0 };
-                break;
-            case 7:
+                break;
+            case 7:
                 pi_channels = 4;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
                 //  AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, 0 };
-                break;
-            case 8:
+                break;
+            case 8:
                 pi_channels = 5;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
                 //  AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 };
-                break;
-            case 9:
+                break;
+            case 9:
                 pi_channels = 6;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
                 //  AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 };
-                break;
-            case 10:
+                break;
+            case 10:
                 pi_channels = 7;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
                 //  AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
                 //  AOUT_CHAN_MIDDLERIGHT, 0 };
-                break;
-            case 11:
+                break;
+            case 11:
                 pi_channels = 8;
                 //{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
                 //  AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
                 //  AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE, 0 };
-                break;
-
-            default:
-                throw new NotSupportedException();
-            }
-            pi_channels_padding = pi_channels & 1;
-
-            switch( (h >> 6) & 0x03 )
-            {
-            case 1:
-                pi_bits = 16;
-                break;
+                break;
+
+            default:
+                throw new NotSupportedException();
+            }
+            pi_channels_padding = pi_channels & 1;
+
+            switch( (h >> 6) & 0x03 )
+            {
+            case 1:
+                pi_bits = 16;
+                break;
             case 2:
                 pi_bits = 20;
                 break;
-            case 3:
-                pi_bits = 24;
-                break;
+            case 3:
+                pi_bits = 24;
+                break;
             default:
                 throw new NotSupportedException();
-            }
-            
-            switch( (h >> 8) & 0x0f ) 
-            {
-            case 1:
-                pi_rate = 48000;
-                break;
-            case 4:
-                pi_rate = 96000;
-                break;
-            case 5:
-                pi_rate = 192000;
-                break;
+            }
+            
+            switch( (h >> 8) & 0x0f ) 
+            {
+            case 1:
+                pi_rate = 48000;
+                break;
+            case 4:
+                pi_rate = 96000;
+                break;
+            case 5:
+                pi_rate = 192000;
+                break;
             default:
                 throw new NotSupportedException();
             }
 
             if (s.pcm == null)
-                s.pcm = new AudioPCMConfig(pi_bits, pi_channels, pi_rate);
+                s.pcm = new AudioPCMConfig(pi_bits, pi_channels, pi_rate);
         }
 
         unsafe void demux_ts_packet(FrameReader fr, out TsStream dataStream)
@@ -737,5 +737,5 @@ namespace CUETools.Codecs.BDLPCM
         TsStream chosenStream;
         long _samplePos, _sampleLen;
         BDLPCMReaderSettings settings;
-    }
+    }
 }

CUETools.Codecs.BDLPCM/CUETools.Codecs.BDLPCM.csproj

@@ -1,101 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CUETools.Codecs.BDLPCM</RootNamespace>
+    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <Version>2.1.6.0</Version>
     <AssemblyName>CUETools.Codecs.BDLPCM</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\plugins\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <RootNamespace>CUETools.Codecs</RootNamespace>
+    <Product>CUETools</Product>
+    <Description>A library for encoding and decoding BluRay Disc LPCM audio.</Description>
+    <Copyright>Copyright (c) 2008-2018 Grigory Chudov</Copyright>
+    <Authors>Grigory Chudov</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <OutputPath>..\bin\$(Configuration)\plugins</OutputPath>
+    <RepositoryUrl>https://github.com/gchudov/cuetools.net</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <Company />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\plugins\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BDLPCMReader.cs" />
-    <Compile Include="BDLPCMReaderSettings.cs" />
-    <Compile Include="MPLSReader.cs" />
-    <Compile Include="FrameReader.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TsStream.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
-      <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
-      <Name>CUETools.Codecs</Name>
+
+  <ItemDefinitionGroup>
+    <ProjectReference>
       <Private>False</Private>
     </ProjectReference>
-  </ItemGroup>
+  </ItemDefinitionGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\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>
+
+</Project>

CUETools.Codecs.BDLPCM/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-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("CUETools.Codecs.BDLPCM")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CUETools.Codecs.BDLPCM")]
-[assembly: AssemblyCopyright("Copyright © 2018 Grigory Chudov")]
-[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("671d2a00-4ce2-452b-830e-18c30a7Cb168")]
-
-// 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 Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.6.0")]
-[assembly: AssemblyFileVersion("2.1.6.0")]