Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Commit 7881076

Browse files
author
Jérémie Bertrand
committed
Merge pull request #253 from thiagoabreu/unix_fixes
Run on Mono
2 parents e122e94 + 9c4e49c commit 7881076

19 files changed

+102
-96
lines changed

‎src/Pretzel.Logic/Extensibility/Extensions/AzureHostSupport.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public void MixIn(string directory)
4343

4444
foreach (var file in fileSystem.Directory.GetFiles(directory))
4545
{
46-
var trimStart = file.Replace(directory, string.Empty).TrimStart('/', '\\');
46+
var trimStart = file.Replace(directory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
4747
fileSystem.File.Move(file, Path.Combine(sourceFolder, trimStart));
4848
}
4949

5050
foreach (var directoryToMove in fileSystem.Directory.GetDirectories(directory).Where(n => new DirectoryInfo(n).Name != "_source"))
5151
{
52-
var trimStart = directoryToMove.Replace(directory, string.Empty).TrimStart('/', '\\');
52+
var trimStart = directoryToMove.Replace(directory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
5353
fileSystem.Directory.Move(directoryToMove, Path.Combine(sourceFolder, trimStart));
5454
}
5555

‎src/Pretzel.Logic/Import/WordpressImport.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ private void ImportPost(WordpressPost p)
6363

6464
var yamlHeader = string.Format("---\r\n{0}---\r\n\r\n", header.ToYaml());
6565
var postContent = yamlHeader + p.Content; //todo would be nice to convert to proper md
66-
var fileName = string.Format(@"_posts\{0}-{1}.md", p.Published.ToString("yyyy-MM-dd"), p.PostName.Replace(' ', '-')); //not sure about post name
66+
var postsFolder = "_posts";
67+
var fileName = string.Format("{0}-{1}.md", p.Published.ToString("yyyy-MM-dd"), p.PostName.Replace(' ', '-')); //not sure about post name
6768

68-
fileSystem.File.WriteAllText(Path.Combine(pathToSite, fileName), postContent);
69+
fileSystem.File.WriteAllText(Path.Combine(pathToSite, postsFolder, fileName), postContent);
6970
}
7071

7172

‎src/Pretzel.Logic/Minification/LessTransform.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void Transform(SiteContext siteContext)
7171

7272

7373
var n = cssfile.Replace(".css", ".less");
74-
n = n.Replace('/', '\\');
74+
n = n.Replace('/', Path.DirectorySeparatorChar);
7575

7676
var cssPageToCompile = siteContext.Pages.FirstOrDefault(f => f.OutputFile.Contains(n));
7777
if (cssPageToCompile != null && !shouldCompile.Contains(cssPageToCompile))

‎src/Pretzel.Logic/Properties/Liquid.Designer.cs

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Pretzel.Logic/Properties/Liquid.resx

+9-9
Original file line numberDiff line numberDiff line change
@@ -119,33 +119,33 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\liquid\about.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
122+
<value>..\Resources\Liquid\About.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
123123
</data>
124124
<data name="Atom" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\liquid\atom.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
125+
<value>..\Resources\Liquid\Atom.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
126126
</data>
127127
<data name="Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\liquid\config.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
128+
<value>..\Resources\Liquid\Config.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
129129
</data>
130130
<data name="FirstPost" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\liquid\firstpost.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
131+
<value>..\Resources\Liquid\FirstPost.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
132132
</data>
133133
<data name="Head" type="System.Resources.ResXFileRef, System.Windows.Forms">
134134
<value>..\Resources\Liquid\Head.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135135
</data>
136136
<data name="Index" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\liquid\index.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
137+
<value>..\Resources\Liquid\Index.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
138138
</data>
139139
<data name="Layout" type="System.Resources.ResXFileRef, System.Windows.Forms">
140-
<value>..\resources\liquid\layout.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
140+
<value>..\Resources\Liquid\Layout.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
141141
</data>
142142
<data name="Post" type="System.Resources.ResXFileRef, System.Windows.Forms">
143-
<value>..\resources\liquid\post.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
143+
<value>..\Resources\Liquid\Post.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
144144
</data>
145145
<data name="Rss" type="System.Resources.ResXFileRef, System.Windows.Forms">
146-
<value>..\resources\liquid\rss.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
146+
<value>..\Resources\Liquid\Rss.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
147147
</data>
148148
<data name="Sitemap" type="System.Resources.ResXFileRef, System.Windows.Forms">
149-
<value>..\resources\liquid\sitemap.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
149+
<value>..\Resources\Liquid\Sitemap.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
150150
</data>
151151
</root>

‎src/Pretzel.Logic/Properties/Razor.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Pretzel.Logic/Properties/Razor.resx

+9-9
Original file line numberDiff line numberDiff line change
@@ -119,33 +119,33 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\razor\about.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>..\Resources\Razor\About.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123123
</data>
124124
<data name="Atom" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\razor\atom.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>..\Resources\Razor\Atom.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
<data name="Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\razor\config.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>..\Resources\Razor\Config.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="FirstPost" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\razor\firstpost.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>..\Resources\Razor\FirstPost.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
<data name="Head" type="System.Resources.ResXFileRef, System.Windows.Forms">
134134
<value>..\Resources\Razor\Head.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135135
</data>
136136
<data name="Index" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\razor\index.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>..\Resources\Razor\Index.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138138
</data>
139139
<data name="Layout" type="System.Resources.ResXFileRef, System.Windows.Forms">
140-
<value>..\resources\razor\layout.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
140+
<value>..\Resources\Razor\Layout.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
141141
</data>
142142
<data name="Post" type="System.Resources.ResXFileRef, System.Windows.Forms">
143-
<value>..\resources\razor\post.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
143+
<value>..\Resources\Razor\Post.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
144144
</data>
145145
<data name="Rss" type="System.Resources.ResXFileRef, System.Windows.Forms">
146-
<value>..\resources\razor\rss.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
146+
<value>..\Resources\Razor\Rss.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
147147
</data>
148148
<data name="Sitemap" type="System.Resources.ResXFileRef, System.Windows.Forms">
149-
<value>..\resources\razor\sitemap.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
149+
<value>..\Resources\Razor\Sitemap.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
150150
</data>
151151
</root>

‎src/Pretzel.Logic/Properties/RazorCsProject.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Pretzel.Logic/Properties/RazorCsProject.resx

+15-15
Original file line numberDiff line numberDiff line change
@@ -119,48 +119,48 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="AssemblyInfo_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\razorcsproject\assemblyinfo_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>..\Resources\RazorCsProject\AssemblyInfo_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123123
</data>
124124
<data name="Category_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\razorcsproject\category_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>..\Resources\RazorCsProject\Category_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
<data name="LayoutProject_csproj" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\razorcsproject\layoutproject_csproj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>..\Resources\RazorCsProject\LayoutProject_csproj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="LayoutSolution_sln" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\razorcsproject\layoutsolution_sln;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>..\Resources\RazorCsProject\LayoutSolution_sln;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
<data name="NonProcessedPage_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\resources\razorcsproject\nonprocessedpage_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
134+
<value>..\Resources\RazorCsProject\NonProcessedPage_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135135
</data>
136136
<data name="NuGet_Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\razorcsproject\nuget_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>..\Resources\RazorCsProject\NuGet_Config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138138
</data>
139139
<data name="NuGet_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
140-
<value>..\resources\razorcsproject\nuget_exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
140+
<value>..\Resources\RazorCsProject\NuGet_exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
141141
</data>
142142
<data name="NuGet_targets" type="System.Resources.ResXFileRef, System.Windows.Forms">
143-
<value>..\resources\razorcsproject\nuget_targets;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
143+
<value>..\Resources\RazorCsProject\NuGet_targets;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
144144
</data>
145145
<data name="packages_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
146-
<value>..\resources\razorcsproject\packages_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
146+
<value>..\Resources\RazorCsProject\packages_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
147147
</data>
148148
<data name="PageContext_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
149-
<value>..\resources\razorcsproject\pagecontext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
149+
<value>..\Resources\RazorCsProject\PageContext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
150150
</data>
151151
<data name="Page_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
152-
<value>..\resources\razorcsproject\page_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
152+
<value>..\Resources\RazorCsProject\Page_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
153153
</data>
154154
<data name="Paginator_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
155-
<value>..\resources\razorcsproject\paginator_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
155+
<value>..\Resources\RazorCsProject\Paginator_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
156156
</data>
157157
<data name="SiteContext_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
158-
<value>..\resources\razorcsproject\sitecontext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
158+
<value>..\Resources\RazorCsProject\SiteContext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
159159
</data>
160160
<data name="Tag_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
161-
<value>..\resources\razorcsproject\tag_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
161+
<value>..\Resources\RazorCsProject\Tag_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
162162
</data>
163163
<data name="Web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
164-
<value>..\resources\razorcsproject\web_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
164+
<value>..\Resources\RazorCsProject\Web_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
165165
</data>
166166
</root>

‎src/Pretzel.Logic/Properties/RazorWiki.Designer.cs

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)