diff --git a/pc/CODEC2 GUI/CODEC2 GUI.sln b/pc/CODEC2 GUI/CODEC2 GUI.sln deleted file mode 100644 index 17462e8..0000000 --- a/pc/CODEC2 GUI/CODEC2 GUI.sln +++ /dev/null @@ -1,72 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeDV", "CODEC2 GUI\FreeDV.csproj", "{19634B34-7569-4D1D-8182-B10AC27E13FF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlexLib", "..\..\..\smartsdr-win\FlexLib\FlexLib.csproj", "{7927817C-D5EF-4A9E-B38E-29668F308343}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiWpfFramework", "..\..\..\smartsdr-win\UiWpfFramework\UiWpfFramework.csproj", "{9C0AD871-92FD-461B-84FF-3738D701814F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util", "..\..\..\smartsdr-win\Util\Util.csproj", "{38935DC9-FF48-470C-B876-473A3AE8BD32}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "..\..\..\smartsdr-win\Vita\Vita.csproj", "{6ED364FB-7444-44DA-9196-1D8679425B3E}" -EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CODEC2_GUI_INSTALLER", "CODEC2_GUI_INSTALLER\CODEC2_GUI_INSTALLER.vdproj", "{AABE6A3C-F038-4448-981F-F68A6D5069C3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|Any CPU.ActiveCfg = Debug|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|Any CPU.Build.0 = Debug|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|x86.ActiveCfg = Debug|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|x86.Build.0 = Debug|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|Any CPU.ActiveCfg = Release|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|Any CPU.Build.0 = Release|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|x86.ActiveCfg = Release|x86 - {19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|x86.Build.0 = Release|x86 - {7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|x86.ActiveCfg = Debug|x86 - {7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|x86.Build.0 = Debug|x86 - {7927817C-D5EF-4A9E-B38E-29668F308343}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7927817C-D5EF-4A9E-B38E-29668F308343}.Release|Any CPU.Build.0 = Release|Any CPU - {7927817C-D5EF-4A9E-B38E-29668F308343}.Release|x86.ActiveCfg = Release|x86 - {7927817C-D5EF-4A9E-B38E-29668F308343}.Release|x86.Build.0 = Release|x86 - {9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|x86.ActiveCfg = Debug|x86 - {9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|x86.Build.0 = Debug|x86 - {9C0AD871-92FD-461B-84FF-3738D701814F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C0AD871-92FD-461B-84FF-3738D701814F}.Release|Any CPU.Build.0 = Release|Any CPU - {9C0AD871-92FD-461B-84FF-3738D701814F}.Release|x86.ActiveCfg = Release|x86 - {9C0AD871-92FD-461B-84FF-3738D701814F}.Release|x86.Build.0 = Release|x86 - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|x86.ActiveCfg = Debug|x86 - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|x86.Build.0 = Debug|x86 - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|Any CPU.Build.0 = Release|Any CPU - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|x86.ActiveCfg = Release|x86 - {38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|x86.Build.0 = Release|x86 - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|x86.ActiveCfg = Debug|x86 - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|x86.Build.0 = Debug|x86 - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.ActiveCfg = Release|x86 - {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.Build.0 = Release|x86 - {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|Any CPU.ActiveCfg = Debug - {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|x86.ActiveCfg = Debug - {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Release|Any CPU.ActiveCfg = Release - {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Release|x86.ActiveCfg = Release - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs index 7eede1b..7c8bcb8 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ 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("CODEC2 GUI")] +[assembly: AssemblyTitle("FreeDV")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("FlexRadio Systems")] -[assembly: AssemblyProduct("CODEC2 GUI")] +[assembly: AssemblyProduct("FreeDV")] [assembly: AssemblyCopyright("Copyright © FlexRadio Systems 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/CODEC2_GUI_INSTALLER.vdproj b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/CODEC2_GUI_INSTALLER.vdproj index 9beda2f..7dee61d 100644 --- a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/CODEC2_GUI_INSTALLER.vdproj +++ b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/CODEC2_GUI_INSTALLER.vdproj @@ -28,18 +28,12 @@ "Entry" { "MsmKey" = "8:_5CEDCDF93E5B7CFBE321CF19FD2C7803" - "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" + "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5CEDCDF93E5B7CFBE321CF19FD2C7803" - "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6748E4DC3B32BC179308D4851C35E7C1" "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" "MsmSig" = "8:_UNDEFINED" } @@ -51,20 +45,26 @@ } "Entry" { - "MsmKey" = "8:_88C1D5A632F74D7EBC8A5FDC131505EE" + "MsmKey" = "8:_6748E4DC3B32BC179308D4851C35E7C1" + "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7787190E645F43148513359C32C91ABF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AE42FAD06947980DC7F9C55738272477" - "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" + "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AE42FAD06947980DC7F9C55738272477" - "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" + "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -76,13 +76,13 @@ "Entry" { "MsmKey" = "8:_B357A8AC90A6A97181BBB20C00BD936F" - "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" + "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B357A8AC90A6A97181BBB20C00BD936F" - "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" + "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,13 +106,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" + "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F9BAD375B293446A9F0FF56E3C1BC4E9" + "OwnerKey" = "8:_B0841DE114E3AF989C6F57AD9D41984C" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -157,6 +157,27 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client" + { + "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + { + "Name" = "8:Windows Installer 3.1" + "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + } + } + } } "Release" { @@ -173,6 +194,27 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client" + { + "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + { + "Name" = "8:Windows Installer 3.1" + "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + } + } + } } } "Deployable" @@ -246,7 +288,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Vita, Version=1.0.1.26108, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Vita, Version=1.0.1.29393, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_5CEDCDF93E5B7CFBE321CF19FD2C7803" @@ -304,10 +346,10 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88C1D5A632F74D7EBC8A5FDC131505EE" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7787190E645F43148513359C32C91ABF" { - "SourcePath" = "8:FreeDV_Release.ssdr_waveform" - "TargetName" = "8:FreeDV_Release.ssdr_waveform" + "SourcePath" = "8:..\\..\\..\\..\\..\\..\\Desktop\\FreeDV.ssdr_waveform" + "TargetName" = "8:FreeDV.ssdr_waveform" "Tag" = "8:" "Folder" = "8:_377DE1BBED84443D8A1631B8496FDC4E" "Condition" = "8:" @@ -328,7 +370,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Flex.UiWpfFramework, Version=1.0.1.26108, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Flex.UiWpfFramework, Version=1.0.1.29393, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_AE42FAD06947980DC7F9C55738272477" @@ -359,7 +401,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:FlexLib, Version=1.3.17.26108, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:FlexLib, Version=1.4.5.29411, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_B0841DE114E3AF989C6F57AD9D41984C" @@ -390,7 +432,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Util, Version=1.0.1.26107, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Util, Version=1.0.1.29393, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_B357A8AC90A6A97181BBB20C00BD936F"