Re-added System.Reactive to MPfm.Sound (dependency will be removed so…

…on). Updated MPfm.Windows project/solution files with new MPfm.Windows namespace (didn't update the namespaces in source files yet)
ycastonguay · Feb 8, 2013 · 9ab5f94 · 9ab5f94
1 parent a71b698
commit 9ab5f94
Show file tree

Hide file tree

Showing 18 changed files with 230 additions and 70 deletions.
diff --git a/MPfm/MPfm.Sound/Lib/System.Reactive.dll b/MPfm/MPfm.Sound/Lib/System.Reactive.dll
diff --git a/MPfm/MPfm.Sound/MPfm.Sound.csproj b/MPfm/MPfm.Sound/MPfm.Sound.csproj
@@ -90,6 +90,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Lib\System.Reactive.dll" />
     <Content Include="Lib\taglib-sharp.dll" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MPfm/MPfm.Windows/MPfm.Windows.csproj b/MPfm/MPfm.Windows/MPfm.Windows.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{BCFDCCC6-2F8C-40BB-BE51-BC8E208242D3}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MPfm</RootNamespace>
+    <RootNamespace>MPfm.Windows</RootNamespace>
     <AssemblyName>MPfm</AssemblyName>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>

diff --git a/MPfm/MPfm.Windows/Other Screens/frmAddEditLoop.Designer.cs b/MPfm/MPfm.Windows/Other Screens/frmAddEditLoop.Designer.cs
diff --git a/MPfm/MPfm.Windows/Other Screens/frmAddEditMarker.Designer.cs b/MPfm/MPfm.Windows/Other Screens/frmAddEditMarker.Designer.cs
diff --git a/MPfm/MPfm.Windows/Other Screens/frmEditSongMetadata.Designer.cs b/MPfm/MPfm.Windows/Other Screens/frmEditSongMetadata.Designer.cs
diff --git a/MPfm/MPfm.Windows/Other Screens/frmEffects.Designer.cs b/MPfm/MPfm.Windows/Other Screens/frmEffects.Designer.cs
diff --git a/MPfm/MPfm.Windows/Other Screens/frmPlaylist.Designer.cs b/MPfm/MPfm.Windows/Other Screens/frmPlaylist.Designer.cs