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

V0.2 preparations #9

Merged
merged 5 commits into from
Jan 2, 2016
Merged

V0.2 preparations #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1f2d05
* increased version number
IanStorm Jan 2, 2016
5d6e130
* fixed build issue caused by moving files in hard drive some commit…
IanStorm Jan 2, 2016
27231d7
* test projects won't be built anymore when in release mode
IanStorm Jan 2, 2016
6d367a8
* reset gitignore because if it remains unchanged there are too many…
IanStorm Jan 2, 2016
533b792
* updated AssemblyInfo
IanStorm Jan 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -187,9 +187,3 @@ FakesAssemblies/
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml


# Custom
# --> ReparsePoints.dll
external_code/ReparsePointID/ReparsePointID/*
!external_code/ReparsePointID/ReparsePoints/bin/Release/*
4 changes: 2 additions & 2 deletions UI/Win32/CloudSyncHelper_win32/CloudSyncHelper_win32.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.Prism">
<HintPath>..\externals\Prism\Microsoft.Practices.Prism.dll</HintPath>
<HintPath>..\..\..\externals\Prism\Microsoft.Practices.Prism.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand All @@ -57,7 +57,7 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="XElement.UiCommon">
<HintPath>..\externals\XElement\XElement.UiCommon.dll</HintPath>
<HintPath>..\..\..\externals\XElement\XElement.UiCommon.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion UI/Win32/CloudSyncHelper_win32/Modules/StatusBar/ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
8 changes: 4 additions & 4 deletions UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( "" )]

Expand Down Expand Up @@ -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" )]
2 changes: 0 additions & 2 deletions Visual Studio/CloudSyncHelper.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down