Skip to content

Commit 8bcef0e

Browse files
committed
Fix CI build, revert moving nanoFramework solution file
CI build failed. Not fixing this now.
1 parent da7aa6b commit 8bcef0e

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Build/build-functions.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ function Start-Build([boolean] $IncludeWindowsRuntimeComponent = $false, [boolea
6666
$appVeyorLoggerArg = if (Test-Path "$appVeyorLoggerDll") { "/logger:$appVeyorLoggerDll" } else { "" }
6767

6868
# msbuild does not auto-restore nugets for this project type
69-
& "nuget" restore "$root\UnitsNet.nanoFramework.sln"
69+
& "nuget" restore "$root\UnitsNet.NanoFramework\GeneratedCode\UnitsNet.nanoFramework.sln"
7070
# now build
71-
& "$msbuild" "$root\UnitsNet.nanoFramework.sln" /verbosity:minimal /p:Configuration=Release $fileLoggerArg $appVeyorLoggerArg
71+
& "$msbuild" "$root\UnitsNet.NanoFramework\GeneratedCode\UnitsNet.nanoFramework.sln" /verbosity:minimal /p:Configuration=Release $fileLoggerArg $appVeyorLoggerArg
7272
if ($lastexitcode -ne 0) { exit 1 }
7373
}
7474

CodeGen/Generators/NanoFrameworkGenerator.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Data.SqlTypes;
1+
using System.Collections.Generic;
42
using System.IO;
53
using System.Text;
64
using CodeGen.Generators.NanoFrameworkGen;
@@ -130,7 +128,7 @@ public static void Generate(string rootDir, Quantity[] quantities)
130128
numberQuantity++;
131129
}
132130

133-
GenerateSolution(quantities, rootDir, outputDir);
131+
GenerateSolution(quantities, outputDir);
134132
Log.Information("UnitsNet.nanoFramework.sln generated");
135133
Log.Information($"Count of generated projects: {numberQuantity}");
136134
}
@@ -178,11 +176,11 @@ private static void GenerateProject(StringBuilder sb, Quantity quantity, string
178176
sb.Append("project(OK) ");
179177
}
180178

181-
private static void GenerateSolution(Quantity[] quantities, string rootDir, string outputDir)
179+
private static void GenerateSolution(Quantity[] quantities, string outputDir)
182180
{
183181
var content = new SolutionGenerator(quantities).Generate();
184182

185-
var filePath = Path.Combine(rootDir, "UnitsNet.nanoFramework.sln");
183+
var filePath = Path.Combine(outputDir, "UnitsNet.nanoFramework.sln");
186184

187185
File.WriteAllText(filePath, content, Encoding.UTF8);
188186
}
File renamed without changes.

0 commit comments

Comments
 (0)