Skip to content

Commit b077977

Browse files
committed
Modernize code base
Yeah, I should have split this into topic commits, but mea culpa - 4.5.1 - VS2015 build - less locks in fileserver - Refactored repository and views - Proper FileStreamCache
1 parent 975b095 commit b077977

File tree

153 files changed

+3422
-4319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+3422
-4319
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ packages/
55
*/obj
66
*.suo
77
*.user
8+
*.DotSettings
9+
*.dat
810
setup/Debug
911
setup/Release
1012
setup/*.cmd

GlobalAssemblyInfo.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
#else
99
[assembly: AssemblyConfiguration("Release")]
1010
#endif
11+
1112
[assembly: AssemblyCompany("Nils Maier")]
1213
[assembly: AssemblyProduct("SimpleDLNA")]
13-
[assembly: AssemblyCopyright("Copyright © 2012-2015 Nils Maier")]
14+
[assembly: AssemblyCopyright("Copyright © 2012-2016 Nils Maier")]
1415
[assembly: AssemblyTrademark("")]
1516
[assembly: AssemblyCulture("")]
1617
[assembly: ComVisible(false)]
17-
[assembly: AssemblyVersion("1.1.*")]
18-
[assembly: AssemblyInformationalVersion("1.1")]
19-
[assembly: NeutralResourcesLanguageAttribute("en-US")]
18+
[assembly: AssemblyVersion("1.2.*")]
19+
[assembly: AssemblyInformationalVersion("1.2")]
20+
[assembly: NeutralResourcesLanguage("en-US")]
2021
[assembly: CLSCompliant(true)]

NMaier.Windows.Forms/NMaier.Windows.Forms.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>NMaier.Windows.Forms</RootNamespace>
1111
<AssemblyName>NMaier.Windows.Forms</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
2931
<DefineConstants>TRACE</DefineConstants>
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3235
</PropertyGroup>
3336
<PropertyGroup>
3437
<SignAssembly>true</SignAssembly>

NgenInstaller.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ public override void Install(IDictionary stateSaver)
2020
RuntimeEnvironment.GetRuntimeDirectory(),
2121
"ngen.exe"
2222
);
23-
proc.StartInfo.Arguments = string.Format(
24-
"install /nologo \"{0}\"",
25-
Assembly.GetExecutingAssembly().Location
26-
);
23+
proc.StartInfo.Arguments = $"install /nologo \"{Assembly.GetExecutingAssembly().Location}\"";
2724
proc.StartInfo.UseShellExecute = false;
2825
proc.StartInfo.CreateNoWindow = true;
2926
proc.Start();

SimpleDLNA/FormAbout.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SimpleDLNA/FormAbout.cs

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
using NMaier.SimpleDlna.Utilities;
2-
using System;
3-
using System.Drawing;
4-
using System.Text;
5-
using System.Windows.Forms;
1+
using System.Text;
2+
using NMaier.SimpleDlna.GUI.Properties;
3+
using NMaier.SimpleDlna.Utilities;
4+
using NMaier.Windows.Forms;
65

76
namespace NMaier.SimpleDlna.GUI
87
{
9-
partial class FormAbout : NMaier.Windows.Forms.Form
8+
internal sealed partial class FormAbout : Form
109
{
1110
public FormAbout()
1211
{
1312
InitializeComponent();
14-
Text = String.Format("About {0}", ProductInformation.Title);
13+
Text = $"About {ProductInformation.Title}";
1514
Product.Text = ProductInformation.Title;
1615
Product.Font = BoldFont;
17-
Version.Text = String.Format(
18-
"Version {0}", ProductInformation.ProductVersion);
16+
Version.Text = $"Version {ProductInformation.ProductVersion}";
1917
Copyright.Text = ProductInformation.Copyright;
2018
Copyright.Font = ItalicFont;
21-
License.Text = Encoding.UTF8.GetString(Properties.Resources.LICENSE);
19+
License.Text = Encoding.UTF8.GetString(Resources.LICENSE);
2220
}
2321
}
2422
}

0 commit comments

Comments
 (0)