Skip to content

Commit

Permalink
Bump version to 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kakone committed Feb 19, 2018
1 parent b73e12f commit 8a216e5
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 32 deletions.
31 changes: 23 additions & 8 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@ csharp_style_var_elsewhere = true:error
dotnet_style_predefined_type_for_locals_parameters_members = true:error
dotnet_style_predefined_type_for_member_access = true:error

# name all classes, structs, interfaces, enums, properties, methods, events and delegates using PascalCase
dotnet_naming_rule.properties_should_be_pascal_case.severity = error
dotnet_naming_rule.properties_should_be_pascal_case.symbols = members
dotnet_naming_rule.properties_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.members.applicable_kinds = class,struct,interface,enum,property,method,event,delegate

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

#name parameters using camel_case
dotnet_naming_rule.parameters_should_be_camel_case.severity = error
dotnet_naming_rule.parameters_should_be_camel_case.symbols = parameters
dotnet_naming_rule.parameters_should_be_camel_case.style = camel_case_style

dotnet_naming_symbols.parameters.applicable_kinds = parameter

dotnet_naming_style.camel_case_style.capitalization = camel_case

# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = error
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
Expand All @@ -55,8 +73,6 @@ dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# static fields should have s_ prefix
dotnet_naming_rule.static_fields_should_have_prefix.severity = error
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
Expand All @@ -68,13 +84,12 @@ dotnet_naming_symbols.static_fields.required_modifiers = static
dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.capitalization = camel_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = error
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
# fields should be _camelCase
dotnet_naming_rule.camel_case_for_fields.severity = error
dotnet_naming_rule.camel_case_for_fields.symbols = fields
dotnet_naming_rule.camel_case_for_fields.style = camel_case_underscore_style

dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
dotnet_naming_symbols.fields.applicable_kinds = field

dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
Expand Down
2 changes: 1 addition & 1 deletion SampleApp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Stéphane Mitermite")]
[assembly: AssemblyProduct("SampleApp")]
[assembly: AssemblyCopyright("Copyright © 2016 Stéphane Mitermite")]
[assembly: AssemblyCopyright("Copyright © 2018 Stéphane Mitermite")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
6 changes: 3 additions & 3 deletions SampleApp/SampleApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="libVLCX">
<Version>0.9.7</Version>
<Version>3.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.5</Version>
<Version>6.0.7</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="MvvmLightLibs">
<Version>5.3.0</Version>
<Version>5.4.1</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
9 changes: 3 additions & 6 deletions SampleApp/ViewModelLocator.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GalaSoft.MvvmLight.Ioc;
using Microsoft.Practices.ServiceLocation;
using CommonServiceLocator;
using GalaSoft.MvvmLight.Ioc;

namespace SampleApp
{
Expand All @@ -22,9 +22,6 @@ static ViewModelLocator()
/// <summary>
/// Gets the main viewmodel.
/// </summary>
public MainViewModel Main
{
get { return ServiceLocator.Current.GetInstance<MainViewModel>(); }
}
public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<package >
<metadata>
<id>VLC.MediaElement.ClassLibrary</id>
<version>0.9.21</version>
<version>3.0.1</version>
<authors>Stéphane Mitermite</authors>
<owners>Stéphane Mitermite</owners>
<licenseUrl>https://github.com/kakone/VLC.MediaElement/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/kakone/VLC.MediaElement</projectUrl>
<title>VLC.MediaElement for UWP (Class Library)</title>
<description>MediaElement clone powered by VLC</description>
<releaseNotes>Beta release. Requires Windows 10 Anniversary Edition and matching Windows SDK.</releaseNotes>
<releaseNotes>Requires Windows 10 Anniversary Edition and matching Windows SDK.</releaseNotes>
<copyright>Copyright © 2017 Stéphane Mitermite</copyright>
<tags>vlc libvlc mediaelement player video audio</tags>
<dependencies>
<dependency id="libVLCX" version="0.9.7" />
<dependency id="libVLCX" version="3.0.1" />
<dependency id="Nito.AsyncEx" version="4.0.1" />
</dependencies>
<contentFiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="libVLCX">
<Version>0.9.7</Version>
<Version>3.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.5</Version>
<Version>6.0.7</Version>
</PackageReference>
<PackageReference Include="Nito.AsyncEx">
<Version>4.0.1</Version>
Expand Down
6 changes: 3 additions & 3 deletions VLCMediaElement/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Stéphane Mitermite")]
[assembly: AssemblyProduct("VLCMediaElement")]
[assembly: AssemblyCopyright("Copyright © 2017 Stéphane Mitermite")]
[assembly: AssemblyCopyright("Copyright © 2018 Stéphane Mitermite")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,6 +23,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.15.0")]
[assembly: AssemblyFileVersion("0.9.15.0")]
[assembly: AssemblyVersion("3.0.1.0")]
[assembly: AssemblyFileVersion("3.0.1.0")]
[assembly: ComVisible(false)]
6 changes: 3 additions & 3 deletions VLCMediaElement/VLC.MediaElement.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<package>
<metadata>
<id>VLC.MediaElement</id>
<version>0.9.21</version>
<version>3.0.1</version>
<authors>Stéphane Mitermite</authors>
<owners>Stéphane Mitermite</owners>
<licenseUrl>https://github.com/kakone/VLC.MediaElement/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/kakone/VLC.MediaElement</projectUrl>
<title>VLC.MediaElement for UWP (Windows Runtime Component)</title>
<description>MediaElement clone powered by VLC</description>
<releaseNotes>Beta release. Requires Windows 10 Anniversary Edition and matching Windows SDK.</releaseNotes>
<releaseNotes>Requires Windows 10 Anniversary Edition and matching Windows SDK.</releaseNotes>
<copyright>Copyright © 2017 Stéphane Mitermite</copyright>
<tags>vlc libvlc mediaelement player video audio</tags>
<dependencies>
<dependency id="libVLCX" version="0.9.7" />
<dependency id="libVLCX" version="3.0.1" />
<dependency id="Nito.AsyncEx" version="4.0.1" />
</dependencies>
<contentFiles>
Expand Down
6 changes: 3 additions & 3 deletions VLCMediaElement/VLCMediaElement.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="libVLCX">
<Version>0.9.7</Version>
<Version>3.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.5</Version>
<Version>6.0.7</Version>
</PackageReference>
<PackageReference Include="Nito.AsyncEx">
<Version>4.0.1</Version>
Expand Down Expand Up @@ -111,4 +111,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit 8a216e5

Please sign in to comment.