Skip to content

Commit 65e25c4

Browse files
JMS-1JMS-1
committed
Created setup with less Pre-3.9 stuff
1 parent 489b2b4 commit 65e25c4

12 files changed

Lines changed: 93 additions & 88 deletions

File tree

‎DVB.NET Viewer/Setups/Viewer/Viewer.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<OutputPath>..\..\..\msi\</OutputPath>
1818
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1919
<DefineConstants>Debug</DefineConstants>
20-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
20+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2121
<Cultures>de-de</Cultures>
2222
<SuppressPdbOutput>True</SuppressPdbOutput>
2323
<SuppressIces>ICE57</SuppressIces>
2424
</PropertyGroup>
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2626
<OutputPath>..\..\..\msi\</OutputPath>
2727
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
28-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
28+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2929
<Cultures>de-de</Cultures>
3030
<SuppressPdbOutput>True</SuppressPdbOutput>
3131
<SuppressIces>ICE57</SuppressIces>

‎DVB.NET/Administration/DVBNETAdmin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</Reference>
5555
<Reference Include="JMS.DVB.HardwareAbstraction, Version=4.2.0.0, Culture=neutral, PublicKeyToken=7fcd07b9604a99b1, processorArchitecture=MSIL">
5656
<HintPath>..\Assemblies\RunTime\JMS.DVB.HardwareAbstraction.dll</HintPath>
57-
<Private>False</Private>
57+
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="JMS.DVB.SITables, Version=4.2.0.0, Culture=neutral, PublicKeyToken=7fcd07b9604a99b1, processorArchitecture=MSIL">
6060
<HintPath>..\Assemblies\RunTime\JMS.DVB.SITables.dll</HintPath>

‎DVB.NET/Administration/DVBNETAdmin.sln‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DVBNETAdmin", "DVBNETAdmin.csproj", "{DE8396EE-7264-4E0C-A4F6-F65A5E7C1D9F}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{76D4B1A1-14FF-4265-8351-06DFD98F2DC3} = {76D4B1A1-14FF-4265-8351-06DFD98F2DC3}
9+
EndProjectSection
10+
EndProject
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JMS.DVB.HardwareAbstraction", "..\HardwareAbstraction\JMS.DVB.HardwareAbstraction.csproj", "{76D4B1A1-14FF-4265-8351-06DFD98F2DC3}"
12+
EndProject
13+
Global
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug|Any CPU = Debug|Any CPU
16+
Release|Any CPU = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19+
{DE8396EE-7264-4E0C-A4F6-F65A5E7C1D9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{DE8396EE-7264-4E0C-A4F6-F65A5E7C1D9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{DE8396EE-7264-4E0C-A4F6-F65A5E7C1D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{DE8396EE-7264-4E0C-A4F6-F65A5E7C1D9F}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{76D4B1A1-14FF-4265-8351-06DFD98F2DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{76D4B1A1-14FF-4265-8351-06DFD98F2DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{76D4B1A1-14FF-4265-8351-06DFD98F2DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{76D4B1A1-14FF-4265-8351-06DFD98F2DC3}.Release|Any CPU.Build.0 = Release|Any CPU
27+
EndGlobalSection
28+
GlobalSection(SolutionProperties) = preSolution
29+
HideSolutionNode = FALSE
30+
EndGlobalSection
31+
EndGlobal

‎DVB.NET/Card Server/Test Application/CardServerTester.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@
4747
<PlatformTarget>x86</PlatformTarget>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="JMS.ChannelManagement, Version=4.2.0.0, Culture=neutral, PublicKeyToken=7fcd07b9604a99b1, processorArchitecture=MSIL">
51-
<HintPath>..\..\Assemblies\RunTime\JMS.ChannelManagement.dll</HintPath>
52-
<Aliases>oldVersion</Aliases>
53-
<Private>False</Private>
54-
</Reference>
5550
<Reference Include="JMS.DVB.CardServerCore, Version=4.2.0.0, Culture=neutral, PublicKeyToken=7fcd07b9604a99b1, processorArchitecture=MSIL">
5651
<HintPath>..\..\Assemblies\RunTime\JMS.DVB.CardServerCore.dll</HintPath>
5752
<Private>False</Private>

‎DVB.NET/Card Server/Test Application/Program.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
extern alias oldVersion;
2-
3-
using System;
4-
using System.Threading;
1+
using System;
52
using System.Globalization;
3+
using System.Threading;
64
using System.Windows.Forms;
7-
85
using JMS.DVB;
96

10-
using legacy = oldVersion.JMS.ChannelManagement;
11-
127

138
namespace CardServerTester
149
{

‎DVB.NET/HardwareAbstraction/UserProfile.cs‎

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,20 @@ public static class UserProfile
2323
Serializable,
2424
XmlRoot( "UserProfile" )
2525
]
26-
private class Persistence
26+
public class Persisted
2727
{
28+
/// <summary>
29+
/// Die alte Art der Darstellung.
30+
/// </summary>
31+
[Serializable]
32+
public class Legacy
33+
{
34+
/// <summary>
35+
/// Der Name des Geräteprofils.
36+
/// </summary>
37+
public string ProfileName { get; set; }
38+
}
39+
2840
/// <summary>
2941
/// Der XML Namensraum, der für die serialisierte Form verwendet wird.
3042
/// </summary>
@@ -43,7 +55,32 @@ private class Persistence
4355
/// <summary>
4456
/// Das zugehörige Geräteprofil.
4557
/// </summary>
46-
public string ProfileName { get; set; }
58+
public Legacy Profile { get; set; }
59+
60+
/// <summary>
61+
/// Der Name des zugehörigen Geräteprofils.
62+
/// </summary>
63+
[XmlIgnore]
64+
public string ProfileName
65+
{
66+
get
67+
{
68+
// Check profile
69+
var profile = Profile;
70+
if (profile == null)
71+
return null;
72+
else
73+
return profile.ProfileName;
74+
}
75+
set
76+
{
77+
// Update
78+
if (string.IsNullOrEmpty( value ))
79+
Profile = null;
80+
else
81+
Profile = new Legacy { ProfileName = value };
82+
}
83+
}
4784

4885
/// <summary>
4986
/// Meldet oder legt fest, ob die Auswahl des Geräteprofils immer angezeigt werden soll.
@@ -74,7 +111,7 @@ public void Save()
74111
/// Lädt die Vorgaben des aktuellen Anwenders.
75112
/// </summary>
76113
/// <returns>Die Vorgaben für diesen Anwender.</returns>
77-
public static Persistence Load()
114+
public static Persisted Load()
78115
{
79116
// Get the user profile directory
80117
var profileDir = new DirectoryInfo( Path.Combine( Environment.GetFolderPath( Environment.SpecialFolder.LocalApplicationData ), "DVBNETProfiles" ) );
@@ -86,26 +123,20 @@ public static Persistence Load()
86123
var profile = new FileInfo( Path.Combine( profileDir.FullName, "UserProfile.dup" ) );
87124

88125
// The new profile
89-
Persistence settings;
126+
Persisted settings;
90127

91128
// Load or create
92-
if (profile.Exists)
93-
{
94-
// Open
129+
if (!profile.Exists)
130+
settings = new Persisted();
131+
else
95132
using (var stream = new FileStream( profile.FullName, FileMode.Open, FileAccess.Read, FileShare.Read ))
96133
{
97134
// Create serializer
98-
var serializer = new XmlSerializer( typeof( UserProfile ), ProfileNamespace );
135+
var serializer = new XmlSerializer( typeof( Persisted ), ProfileNamespace );
99136

100137
// Process
101-
settings = (Persistence) serializer.Deserialize( stream );
138+
settings = (Persisted) serializer.Deserialize( stream );
102139
}
103-
}
104-
else
105-
{
106-
// Create new
107-
settings = new Persistence();
108-
}
109140

110141
// Remember root
111142
settings.m_File = profile;
@@ -118,7 +149,7 @@ public static Persistence Load()
118149
/// <summary>
119150
/// Die aktuelle Konfiguration.
120151
/// </summary>
121-
private static Persistence m_Settings = Persistence.Load();
152+
private static Persisted m_Settings = Persisted.Load();
122153

123154
/// <summary>
124155
/// Speichert die Einstellungen des aktuellen Anwenders.

‎DVB.NET/Setups/Core/CoreSetup.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1818
<DefineConstants>Debug</DefineConstants>
1919
<SuppressPdbOutput>True</SuppressPdbOutput>
20-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
20+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2121
<Cultures>de-de</Cultures>
2222
<SuppressIces>ICE57</SuppressIces>
2323
</PropertyGroup>
2424
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2525
<OutputPath>..\..\..\msi\</OutputPath>
2626
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2727
<SuppressPdbOutput>True</SuppressPdbOutput>
28-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
28+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2929
<Cultures>de-de</Cultures>
3030
<SuppressIces>ICE57</SuppressIces>
3131
</PropertyGroup>

‎DVB.NET/Setups/Server/CardServerSetup.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<OutputPath>..\..\..\msi\</OutputPath>
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1818
<DefineConstants>Debug</DefineConstants>
19-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
19+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2020
<SuppressPdbOutput>True</SuppressPdbOutput>
2121
<Cultures>de-de</Cultures>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2424
<OutputPath>..\..\..\msi\</OutputPath>
2525
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
26-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
26+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2727
<SuppressPdbOutput>True</SuppressPdbOutput>
2828
<Cultures>de-de</Cultures>
2929
</PropertyGroup>

‎DVB.NET/Setups/Tools/ToolSetup.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<OutputPath>..\..\..\msi\</OutputPath>
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1818
<DefineConstants>Debug</DefineConstants>
19-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
19+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2020
<Cultures>de-de</Cultures>
2121
<SuppressPdbOutput>True</SuppressPdbOutput>
2222
<SuppressIces>ICE57</SuppressIces>
2323
</PropertyGroup>
2424
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2525
<OutputPath>..\..\..\msi\</OutputPath>
2626
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
27-
<WixVariables>SETUPVERSION=4.2.15</WixVariables>
27+
<WixVariables>SETUPVERSION=4.2.16</WixVariables>
2828
<Cultures>de-de</Cultures>
2929
<SuppressPdbOutput>True</SuppressPdbOutput>
3030
<SuppressIces>ICE57</SuppressIces>

‎VCR.NET/InstallerActions/CustomAction.cs‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
extern alias oldVersion;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.IO;
54
using System.Linq;
@@ -11,7 +10,6 @@
1110
using JMS.DVBVCR.InstallerActions;
1211
using Microsoft.Deployment.WindowsInstaller;
1312
using Microsoft.Win32;
14-
using legacy = oldVersion.JMS;
1513

1614

1715
namespace InstallerActions
@@ -93,7 +91,7 @@ public static ActionResult AsAdmin( Session session )
9391
}
9492
}
9593
catch (Exception)
96-
{
94+
{
9795
}
9896

9997
// Did it
@@ -245,47 +243,8 @@ private static void MigrateConfiguration( Session session )
245243

246244
// See if use should choose profile
247245
if (string.IsNullOrEmpty( profileNames ))
248-
{
249-
// Ask user
250246
using (var dialog = new ProfileInstaller( newConfiguration ))
251247
dialog.ShowDialog();
252-
}
253-
else
254-
{
255-
// All legacy profiles
256-
var oldProfiles = legacy.ChannelManagement.DeviceProfile.SystemProfiles.ToDictionary( p => p.Name, ProfileManager.ProfileNameComparer );
257-
258-
// Run conversion
259-
foreach (var profileNameRaw in profileNames.Split( '|' ))
260-
{
261-
// Get the name
262-
var profileName = profileNameRaw.Trim();
263-
if (ProfileManager.FindProfile( profileName ) != null)
264-
continue;
265-
266-
// Load it
267-
legacy.ChannelManagement.DeviceProfile oldProfile;
268-
if (!oldProfiles.TryGetValue( profileName, out oldProfile ))
269-
continue;
270-
271-
// Try to convert
272-
try
273-
{
274-
// Process
275-
var newProfile = ProfileTools.Convert( oldProfile );
276-
277-
// Finish
278-
newProfile.MakePermanent();
279-
280-
// Refresh
281-
ProfileManager.Refresh();
282-
}
283-
catch
284-
{
285-
// Ignore any error.
286-
}
287-
}
288-
}
289248

290249
// Save the configuration
291250
newConfiguration.Save( newConfigurationPath.FullName );

0 commit comments

Comments
 (0)