Skip to content

Commit 02a7d7d

Browse files
authored
Fix referencing stable/preview NuGets for .NET nanoFramework (#958)
1 parent 8e603bf commit 02a7d7d

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

CodeGen/Generators/NanoFrameworkGenerator.cs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,30 +140,27 @@ private static void SetDependencyVersions(FindPackageByIdResource resource, Sour
140140
logger,
141141
cancellationToken).Result;
142142

143-
// NuGet package Version
144-
// including preview
145-
var mscorlibPackage = packageVersions.Where(v => v.IsPrerelease).OrderByDescending(v => v).First();
146-
// stable only
147-
//var mscorlibPackage = packageVersions.OrderByDescending(v => v).First();
143+
// get NuGet package Version for mscorlib
144+
// grab latest available (doesn't matter if it's preview or stable)
145+
NuGetVersion mscorlibVersion = packageVersions.OrderByDescending(v => v).First();
146+
MscorlibVersion = mscorlibVersion.Version.ToString();
147+
MscorlibNuGetVersion = mscorlibVersion.ToNormalizedString();
148148

149-
MscorlibVersion = mscorlibPackage.Version.ToString();
150-
MscorlibNuGetVersion = mscorlibPackage.ToNormalizedString();
151-
152-
// Math
149+
// System.Math
153150
packageVersions = resource.GetAllVersionsAsync(
154151
"nanoFramework.System.Math",
155152
cache,
156153
logger,
157154
cancellationToken).Result;
158155

159-
// NuGet package Version
160-
// including preview
161-
var mathPackage = packageVersions.Where(v => v.IsPrerelease).OrderByDescending(v => v).First();
162-
// stable only
163-
//var mathPackage = MathNuGetVersion = packageVersions.OrderByDescending(v => v).First();
156+
// grab latest available (doesn't matter if it's preview or stable)
157+
// making an assumption here that the available version is referencing the correct mscolib
158+
var mathVersion = packageVersions.OrderByDescending(v => v).First();
159+
MathVersion = mathVersion.Version.ToString();
160+
MathNuGetVersion = mathVersion.ToNormalizedString();
164161

165-
MathVersion = mathPackage.Version.ToString();
166-
MathNuGetVersion = mathPackage.ToNormalizedString();
162+
logger.LogInformation($"Referencing nanoFramework.CoreLibrary {MscorlibNuGetVersion}");
163+
logger.LogInformation($"Referencing nanoFramework.System.Math {MathNuGetVersion}");
167164
}
168165
else
169166
{

0 commit comments

Comments
 (0)