Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit 9c21ef2

Browse files
committed
Merge pull request #9 from XElementSoftware/v0.2-preparations
V0.2 preparations
2 parents 277a63c + 533b792 commit 9c21ef2

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

.gitignore

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
# Build results
1010
[Dd]ebug/
1111
[Dd]ebugPublic/
12-
[Rr]elease/*
12+
[Rr]elease/
1313
x64/
1414
build/
1515
bld/
16-
[Bb]in/*
16+
[Bb]in/
1717
[Oo]bj/
1818

1919
# Roslyn cache directories
@@ -187,9 +187,3 @@ FakesAssemblies/
187187
GeneratedArtifacts/
188188
_Pvt_Extensions/
189189
ModelManifest.xml
190-
191-
192-
# Custom
193-
# --> ReparsePoints.dll
194-
external_code/ReparsePointID/ReparsePointID/*
195-
!external_code/ReparsePointID/ReparsePoints/bin/Release/*

UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="Microsoft.Practices.Prism">
41-
<HintPath>..\externals\Prism\Microsoft.Practices.Prism.dll</HintPath>
41+
<HintPath>..\..\..\externals\Prism\Microsoft.Practices.Prism.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.ComponentModel.Composition" />
@@ -57,7 +57,7 @@
5757
<Reference Include="PresentationCore" />
5858
<Reference Include="PresentationFramework" />
5959
<Reference Include="XElement.UiCommon">
60-
<HintPath>..\externals\XElement\XElement.UiCommon.dll</HintPath>
60+
<HintPath>..\..\..\externals\XElement\XElement.UiCommon.dll</HintPath>
6161
</Reference>
6262
</ItemGroup>
6363
<ItemGroup>

UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void IPartImportsSatisfiedNotification.OnImportsSatisfied()
1919
else if ( osId == OsId.Win10 ) this.IsWindows10 = true;
2020

2121
var assemblyVersion = typeof( App ).Assembly.GetName().Version;
22-
this.Version = string.Format( "v{0}+", assemblyVersion );
22+
this.Version = string.Format( "v{0}", assemblyVersion );
2323
}
2424

2525
public string Version { get; private set; }

UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
[assembly: AssemblyDescription( "" )]
1010
[assembly: AssemblyConfiguration( "" )]
1111
[assembly: AssemblyCompany( "" )]
12-
[assembly: AssemblyProduct( "CloudSyncHelper_win32" )]
13-
[assembly: AssemblyCopyright( "Copyright © 2015" )]
12+
[assembly: AssemblyProduct( "Cloud Sync Helper" )]
13+
[assembly: AssemblyCopyright( "Copyright © XElementSoftware 2015-206" )]
1414
[assembly: AssemblyTrademark( "" )]
1515
[assembly: AssemblyCulture( "" )]
1616

@@ -49,5 +49,5 @@
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion( "1.0.0.148" )]
53-
[assembly: AssemblyFileVersion( "1.0.0.148" )]
52+
[assembly: AssemblyVersion( "0.2.0.242" )]
53+
[assembly: AssemblyFileVersion( "0.2.0.242" )]

Visual Studio/CloudSyncHelper.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ Global
137137
{4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138138
{4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Debug|Any CPU.Build.0 = Debug|Any CPU
139139
{4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Release|Any CPU.ActiveCfg = Release|Any CPU
140-
{4478D557-E984-4D2E-92F4-7DE0FD4A268B}.Release|Any CPU.Build.0 = Release|Any CPU
141140
{092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142141
{092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
143142
{092AD2AD-CE22-4ABB-9C87-E9A5083C25FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -149,7 +148,6 @@ Global
149148
{4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150149
{4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
151150
{4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Release|Any CPU.ActiveCfg = Release|Any CPU
152-
{4745F43A-FBC7-4F3A-A2F5-DACB8C4CB30D}.Release|Any CPU.Build.0 = Release|Any CPU
153151
EndGlobalSection
154152
GlobalSection(SolutionProperties) = preSolution
155153
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)