Skip to content

Commit

Permalink
Modernize code base
Browse files Browse the repository at this point in the history
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
  • Loading branch information
nmaier committed Oct 13, 2016
1 parent 975b095 commit b077977
Show file tree
Hide file tree
Showing 153 changed files with 3,422 additions and 4,319 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ packages/
*/obj
*.suo
*.user
*.DotSettings
*.dat
setup/Debug
setup/Release
setup/*.cmd
Expand Down
9 changes: 5 additions & 4 deletions GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
#else
[assembly: AssemblyConfiguration("Release")]
#endif

[assembly: AssemblyCompany("Nils Maier")]
[assembly: AssemblyProduct("SimpleDLNA")]
[assembly: AssemblyCopyright("Copyright © 2012-2015 Nils Maier")]
[assembly: AssemblyCopyright("Copyright © 2012-2016 Nils Maier")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyInformationalVersion("1.1")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
[assembly: AssemblyVersion("1.2.*")]
[assembly: AssemblyInformationalVersion("1.2")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: CLSCompliant(true)]
7 changes: 5 additions & 2 deletions NMaier.Windows.Forms/NMaier.Windows.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NMaier.Windows.Forms</RootNamespace>
<AssemblyName>NMaier.Windows.Forms</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -21,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -29,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down
5 changes: 1 addition & 4 deletions NgenInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ public override void Install(IDictionary stateSaver)
RuntimeEnvironment.GetRuntimeDirectory(),
"ngen.exe"
);
proc.StartInfo.Arguments = string.Format(
"install /nologo \"{0}\"",
Assembly.GetExecutingAssembly().Location
);
proc.StartInfo.Arguments = $"install /nologo \"{Assembly.GetExecutingAssembly().Location}\"";
proc.StartInfo.UseShellExecute = false;
proc.StartInfo.CreateNoWindow = true;
proc.Start();
Expand Down
2 changes: 1 addition & 1 deletion SimpleDLNA/FormAbout.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions SimpleDLNA/FormAbout.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
using NMaier.SimpleDlna.Utilities;
using System;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using System.Text;
using NMaier.SimpleDlna.GUI.Properties;
using NMaier.SimpleDlna.Utilities;
using NMaier.Windows.Forms;

namespace NMaier.SimpleDlna.GUI
{
partial class FormAbout : NMaier.Windows.Forms.Form
internal sealed partial class FormAbout : Form
{
public FormAbout()
{
InitializeComponent();
Text = String.Format("About {0}", ProductInformation.Title);
Text = $"About {ProductInformation.Title}";
Product.Text = ProductInformation.Title;
Product.Font = BoldFont;
Version.Text = String.Format(
"Version {0}", ProductInformation.ProductVersion);
Version.Text = $"Version {ProductInformation.ProductVersion}";
Copyright.Text = ProductInformation.Copyright;
Copyright.Font = ItalicFont;
License.Text = Encoding.UTF8.GetString(Properties.Resources.LICENSE);
License.Text = Encoding.UTF8.GetString(Resources.LICENSE);
}
}
}
Loading

0 comments on commit b077977

Please sign in to comment.