diff --git a/.gitignore b/.gitignore index 4e1db2f..2ec93bb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,11 +9,11 @@ # Build results [Dd]ebug/ [Dd]ebugPublic/ -[Rr]elease/* +[Rr]elease/ x64/ build/ bld/ -[Bb]in/* +[Bb]in/ [Oo]bj/ # Roslyn cache directories @@ -187,9 +187,3 @@ FakesAssemblies/ GeneratedArtifacts/ _Pvt_Extensions/ ModelManifest.xml - - -# Custom -# --> ReparsePoints.dll -external_code/ReparsePointID/ReparsePointID/* -!external_code/ReparsePointID/ReparsePoints/bin/Release/* diff --git a/UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj b/UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj index 4208a0b..875dde6 100644 --- a/UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj +++ b/UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj @@ -38,7 +38,7 @@ - ..\externals\Prism\Microsoft.Practices.Prism.dll + ..\..\..\externals\Prism\Microsoft.Practices.Prism.dll @@ -57,7 +57,7 @@ - ..\externals\XElement\XElement.UiCommon.dll + ..\..\..\externals\XElement\XElement.UiCommon.dll diff --git a/UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs b/UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs index a5eaff0..0566217 100644 --- a/UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs +++ b/UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs @@ -19,7 +19,7 @@ void IPartImportsSatisfiedNotification.OnImportsSatisfied() else if ( osId == OsId.Win10 ) this.IsWindows10 = true; var assemblyVersion = typeof( App ).Assembly.GetName().Version; - this.Version = string.Format( "v{0}+", assemblyVersion ); + this.Version = string.Format( "v{0}", assemblyVersion ); } public string Version { get; private set; } diff --git a/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs b/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs index 316be95..e7c132c 100644 --- a/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs +++ b/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ [assembly: AssemblyDescription( "" )] [assembly: AssemblyConfiguration( "" )] [assembly: AssemblyCompany( "" )] -[assembly: AssemblyProduct( "CloudSyncHelper_win32" )] -[assembly: AssemblyCopyright( "Copyright © 2015" )] +[assembly: AssemblyProduct( "Cloud Sync Helper" )] +[assembly: AssemblyCopyright( "Copyright © XElementSoftware 2015-206" )] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] @@ -49,5 +49,5 @@ // 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( "1.0.0.148" )] -[assembly: AssemblyFileVersion( "1.0.0.148" )] +[assembly: AssemblyVersion( "0.2.0.242" )] +[assembly: AssemblyFileVersion( "0.2.0.242" )] diff --git a/Visual Studio/CloudSyncHelper.sln b/Visual Studio/CloudSyncHelper.sln index 1cda54b..f86cbda 100644 --- a/Visual Studio/CloudSyncHelper.sln +++ b/Visual Studio/CloudSyncHelper.sln @@ -137,7 +137,6 @@ Global {4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Release|Any CPU.Build.0 = Release|Any CPU {092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -149,7 +148,6 @@ Global {4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Debug|Any CPU.Build.0 = Debug|Any CPU {4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE