Skip to content

Commit 48ef9fd

Browse files
committed
Upgrade griddly version
Support dropbox lookup for default folder no registry key (windows 10) Handle weird publish issue on content files
1 parent c854bdc commit 48ef9fd

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

Build/CommonAssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.4.5")]
19-
[assembly: AssemblyFileVersion("1.4.5")]
20-
[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]
18+
[assembly: AssemblyVersion("1.4.6")]
19+
[assembly: AssemblyFileVersion("1.4.6")]
20+
//[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Build/build.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<ItemGroup>
2626
<Libs Include="$(BaseDir)\Griddly.Mvc\bin\$(Configuration)\Griddly.Mvc.dll" />
2727
<Content Include="$(BaseDir)\Griddly\**\griddly.js" />
28-
<Content Include="$(BaseDir)\Griddly\**\griddly.css" />
29-
<Content Include="$(BaseDir)\Griddly\**\Griddly\*.*" />
3028
<Content Include="$(BaseDir)\Griddly\**\editly.js" />
29+
<Content Include="$(BaseDir)\Griddly\**\griddly.css" />
30+
<Content Include="$(BaseDir)\Griddly\**\Views\Shared\Griddly\*.*" />
3131
</ItemGroup>
3232

3333
<Exec Command="rd $(PackageDir) /s /q" />

Build/publish-nuget.ps1

+10-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ $scriptpath = split-path -parent $MyInvocation.MyCommand.Path
55
msbuild $scriptpath/build.proj
66

77
Function Get-DropBox() {
8-
$hostFile = Join-Path (Split-Path (Get-ItemProperty HKCU:\Software\Dropbox).InstallPath) "host.db"
9-
$encodedPath = [System.Convert]::FromBase64String((Get-Content $hostFile)[1])
10-
[System.Text.Encoding]::UTF8.GetString($encodedPath)
8+
if (Test-Path "$HOMEPATH\Dropbox")
9+
{
10+
"$HOMEPATH\Dropbox"
11+
}
12+
else
13+
{
14+
$hostFile = Join-Path (Split-Path (Get-ItemProperty HKCU:\Software\Dropbox).InstallPath) "host.db"
15+
$encodedPath = [System.Convert]::FromBase64String((Get-Content $hostFile)[1])
16+
[System.Text.Encoding]::UTF8.GetString($encodedPath)
17+
}
1118
}
1219

1320
$dropbox = Get-DropBox

0 commit comments

Comments
 (0)