Updating distribution

cDima · Nov 4, 2015 · b8b8cc8 · b8b8cc8
1 parent a309309
commit b8b8cc8
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 6 deletions.
diff --git a/ScreenSaver/Properties/Resources.Designer.cs b/ScreenSaver/Properties/Resources.Designer.cs
diff --git a/ScreenSaver/Properties/Settings.Designer.cs b/ScreenSaver/Properties/Settings.Designer.cs
diff --git a/ScreenSaver/ScreenSaver.csproj b/ScreenSaver/ScreenSaver.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{C79DC106-23F3-4FA7-BA69-6B8684C4AD9F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AerialScreenSaver</RootNamespace>
-    <AssemblyName>AerialScreenSaver</AssemblyName>
+    <RootNamespace>Aerial</RootNamespace>
+    <AssemblyName>Aerial</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>

diff --git a/install/aerial.scr b/install/aerial.scr
diff --git a/install/aerial.scr.zip b/install/aerial.scr.zip
diff --git a/merge/Aerial.exe b/merge/Aerial.exe
diff --git a/merge/AerialScreenSaver.exe b/merge/AerialScreenSaver.exe
diff --git a/merge/aerial.pdb b/merge/aerial.pdb
diff --git a/merge/aerial.scr b/merge/aerial.scr
diff --git a/merge/merge.cmd b/merge/merge.cmd
@@ -1,2 +1,2 @@
-ILMerge.exe /target:winexe /targetplatform:"v4,%PROGRAMFILES%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6" /out:aerial.exe AerialScreenSaver.exe AxInterop.WMPLib.dll Interop.MediaPlayer.dll Interop.WMPLib.dll
+ILMerge.exe /target:winexe /targetplatform:"v4,%PROGRAMFILES%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6" /out:aerialv2.exe Aerial.exe AxInterop.WMPLib.dll Interop.MediaPlayer.dll Interop.WMPLib.dll
 pause
diff --git a/merge/mergex86.cmd b/merge/mergex86.cmd
@@ -0,0 +1,2 @@
+ILMerge.exe /target:winexe /targetplatform:"v4,%PROGRAMFILES(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6" /out:aerialv2.exe Aerial.exe AxInterop.WMPLib.dll Interop.MediaPlayer.dll Interop.WMPLib.dll
+pause
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ILMerge.exe /target:winexe /targetplatform:"v4,%PROGRAMFILES(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6" /out:aerialv2.exe Aerial.exe AxInterop.WMPLib.dll Interop.MediaPlayer.dll Interop.WMPLib.dll
		pause