Merge pull request #29 from bigman73/bugfix/update-dep

+ .NET 4.6.2
bigman73 · Nov 29, 2020 · b11b4ac · b11b4ac
2 parents 74cf52b + c78e565
commit b11b4ac
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,14 @@
+# Practice# Change Log 🎸
+
+## 2.1.0, 2020-11-28
++ .NET 4.6.2
++ Nuget updated dependencies (NAudio)
++ Latest soundtouch library dll (2.1.1)
++ Improved installer build documentation
+
+## 1.6.4, 2013-03-20
++ SoundTouch library updated to 1.7 (optimizations and fixes by library author)
++ NAudio library updated to 1.6 (optimizations and fixes by library author)
++ Change in logic: Cue now occurs in front of the loop instead of at the end
++ Change: Pitch resolution is now in 1/4 semi-tones, instead of 1/2 semi-tones
++ Bug fixes 
diff --git a/Installer/MSI/PracticeSharp.msi b/Installer/MSI/PracticeSharp.msi
diff --git a/Installer/PracticeSharp.wxs b/Installer/PracticeSharp.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 <!-- Practice Sharp
  
-    © Copyright 2010, Yuval Naveh.
+    © Copyright 2010, Yuval Naveh.
      All rights reserved.
  
     This file is part of Practice Sharp.
@@ -28,20 +28,15 @@
 	3. Modify ProductName to contain new version
 	4. Modify ProductCode value (new GUID)
   -->
-  <?define RTMProductVersion="1.7.0" ?>
-  <?define ProductVersion="2.0.7" ?>
-  <?define ProductName="Practice# 2.0.7" ?>
+  <?define RTMProductVersion="2.0.7" ?>
+  <?define ProductVersion="2.1.0" ?>
+  <?define ProductName="Practice# 2.1.0" ?>
   <?define ProductTitle="Practice#" ?>
   <?define UpgradeCode="{698FDA6C-C8E8-4C2B-8705-28A99B39E171}"?>
   <?define Manufacturer="Yuval Naveh" ?> 
-  <?define ProductCode="{B9DD9F2B-0E95-415B-8E13-1E65563B4064}"?>
+  <?define ProductCode="{33632156-9EC1-4025-BB3E-FB4B66A6FB81}"?>
+  <!-- 2.0.7 ProductCode="{B9DD9F2B-0E95-415B-8E13-1E65563B4064}" -->
   <!-- 1.6.5 ProductCode="{343457C9-3E82-4E37-9F1F-39F6CA2AD74F}" -->
-  <!-- 1.6.4 ProductCode="{A3C5065E-1CAE-483F-B2B0-D28919B2F292}" -->
-  <!-- 1.5.1 ProductCode="{4B8B9C04-4DDA-4CF9-AA01-27B160190439}" -->
-  <!-- 1.5.0 ProductCode="{399BCBB0-FB5A-4421-ADA3-CB71B8FF8087}" -->
-  <!-- 1.4.1 ProductCode="{25DCD3FE-0A9E-4AF4-90EC-9AA7A7632E1E}" -->
-  <!-- 1.3.0 ProductCode="{0C948700-3197-4DD6-819C-374AC67EDC87}" -->
-  <!-- 1.2.0 ProductCode="{6ECEC93F-114B-4C46-8F40-CA39EC618CDA}" -->
 
   <Product Name='$(var.ProductName)' Id='$(var.ProductCode)' UpgradeCode='$(var.UpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='$(var.Manufacturer)'>

diff --git a/Installer/README.md b/Installer/README.md
@@ -0,0 +1,23 @@
+# Practice# installater build
+
+## Steps
+1. Get `Wix Installer` zip
+http://wixtoolset.org/
+
+As of Nov 2020, Wix 3.11.2 is available
+https://github.com/wixtoolset/wix3/releases/tag/wix3112rtm
+
+2. Extract the zip into the Installer folder
+There should be a folder under the Installer folder named wix311-binaries
+
+```
+practicesharp
+  Installer
+    wix311-binaries
+```
+
+3. Rebuild Practice# solution in `Release` mode
+
+4. Run the batch file `PracticeShare\Installer\CompilePracticeSharpWix.bat`
+
+Expected Result: An MSI file `PracticeSharp.msi` is generated under the `\MSI` folder 
diff --git a/Installer/README.txt b/Installer/README.txt
diff --git a/NAudioOggVorbis/Library/NAudioOggVorbis.csproj b/NAudioOggVorbis/Library/NAudioOggVorbis.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BigMansStuff.NAudio.Ogg</RootNamespace>
     <AssemblyName>NAudioOggVorbis</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -40,11 +40,11 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\PracticeSharpApp\packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\PracticeSharpApp\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="csogg\Buffer.cs" />

diff --git a/NAudioOggVorbis/Library/Properties/AssemblyInfo.cs b/NAudioOggVorbis/Library/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/NAudioOggVorbis/Library/app.config b/NAudioOggVorbis/Library/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/NAudioOggVorbis/Library/packages.config b/NAudioOggVorbis/Library/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NAudio" version="1.8.4" targetFramework="net35" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NAudio" version="1.10.0" targetFramework="net461" />
 </packages>
diff --git a/PracticeSharpApp/3rdPartyDLL/SoundTouchDLL/SoundTouch.dll b/PracticeSharpApp/3rdPartyDLL/SoundTouchDLL/SoundTouch.dll
diff --git a/PracticeSharpApp/PracticeSharp.csproj b/PracticeSharpApp/PracticeSharp.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BigMansStuff.PracticeSharp</RootNamespace>
     <AssemblyName>PracticeSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -58,23 +58,28 @@
     <ApplicationIcon>Res\PracticeSharp.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio">
-      <HintPath>packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="NAudio.Flac">
       <HintPath>packages\NAudio.Flac.1.0.5702.29018\lib\net45\NAudio.Flac.dll</HintPath>
     </Reference>
     <Reference Include="NAudio.WindowsMediaFormat">
       <HintPath>packages\NAudio.Wma.1.0.1\lib\net35\NAudio.WindowsMediaFormat.dll</HintPath>
     </Reference>
-    <Reference Include="NLog">
-      <HintPath>packages\NLog.4.4.12\lib\net35\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>

diff --git a/PracticeSharpApp/Properties/AssemblyInfo.cs b/PracticeSharpApp/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.0.12.0")]
-[assembly: AssemblyFileVersion("2.0.12.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/PracticeSharpApp/Properties/Resources.Designer.cs b/PracticeSharpApp/Properties/Resources.Designer.cs
diff --git a/PracticeSharpApp/Properties/Settings.Designer.cs b/PracticeSharpApp/Properties/Settings.Designer.cs
diff --git a/PracticeSharpApp/Resources.Designer.cs b/PracticeSharpApp/Resources.Designer.cs
diff --git a/PracticeSharpApp/app.config b/PracticeSharpApp/app.config
@@ -5,7 +5,7 @@
         <section name="BigMansStuff.PracticeSharp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
 </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <userSettings>
         <BigMansStuff.PracticeSharp.Properties.Settings>
               <setting name="LastAudioFolder" serializeAs="String">

diff --git a/PracticeSharpApp/packages.config b/PracticeSharpApp/packages.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NAudio" version="1.8.4" targetFramework="net35" />
-  <package id="NAudio.Flac" version="1.0.5702.29018" targetFramework="net45" />
-  <package id="NAudio.Wma" version="1.0.1" targetFramework="net35" />
-  <package id="NLog" version="4.4.12" targetFramework="net35" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NAudio" version="1.10.0" targetFramework="net461" />
+  <package id="NAudio.Flac" version="1.0.5702.29018" targetFramework="net45" />
+  <package id="NAudio.Wma" version="1.0.1" targetFramework="net35" />
+  <package id="NLog" version="4.7.5" targetFramework="net461" />
 </packages>