Updated to Visual Studio 2010

markheath · Nov 2, 2010 · d375a26 · d375a26
1 parent e12c259
commit d375a26
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 11 deletions.
diff --git a/..svnbridge/.svnbridge b/..svnbridge/.svnbridge
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:ignore</Name><Value>*.suo
+</Value></Property><Property><Name>svn:ignore</Name><Value>MidiFileSplitter.suo
+</Value></Property></Properties></ItemProperties>
diff --git a/MidiFileSplitter.sln b/MidiFileSplitter.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MidiFileSplitter", "MidiFileSplitter\MidiFileSplitter.csproj", "{2FF094D5-DA7D-49E5-BC5B-89CB7A5712EB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAudio", "..\NAudio\NAudio\NAudio.csproj", "{DA4F02E3-0B5E-42CD-B8D9-5583FA51D66E}"

diff --git a/MidiFileSplitter/..svnbridge/.svnbridge b/MidiFileSplitter/..svnbridge/.svnbridge
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:ignore</Name><Value>bin
+obj
+MidiFileSplitter.csproj.user
+</Value></Property></Properties></ItemProperties>
diff --git a/MidiFileSplitter/MidiFileSplitter.cs b/MidiFileSplitter/MidiFileSplitter.cs
@@ -313,9 +313,7 @@ private void ExportAtMarker(MidiFile midiFile, string markerName, string midiFil
                     exportEvents.AddTrack(trackEvents);
                 }
             }
-
-
-
+
             bool gotNotes = false;
             foreach(IList<MidiEvent> trackEvents in exportEvents)
             {            

diff --git a/MidiFileSplitter/MidiFileSplitter.csproj b/MidiFileSplitter/MidiFileSplitter.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,26 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <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>
@@ -26,6 +47,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -102,6 +125,23 @@
       <Name>NAudio</Name>
     </ProjectReference>
   </ItemGroup>
+  <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>
+  </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.

diff --git a/MidiFileSplitter/Properties/AssemblyInfo.cs b/MidiFileSplitter/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@
 //      Revision
 //
 [assembly: AssemblyVersion("0.7.9.0")]
-[assembly: AssemblyFileVersion("0.7.9.0")]
+[assembly: AssemblyFileVersion("0.8.10.0")]
 
 // build 5 - 3 Nov 2006
 // Added an installer
@@ -46,6 +46,8 @@
 // updated to use new MidiEventCollection
 // build 9 - 26 Apr 2007
 // move to separate CodePlex project
+// build 10 - 28 Aug 2010
+// port to VS 2010
 
 // TODO list:
 // upgrade settings

diff --git a/MidiFileSplitter/Properties/Resources.Designer.cs b/MidiFileSplitter/Properties/Resources.Designer.cs
diff --git a/MidiFileSplitter/Properties/Settings.Designer.cs b/MidiFileSplitter/Properties/Settings.Designer.cs