Include a VB proj in testing (#81)

* Include a VB proj in testing * Make uploads unique * unique dir --------- Co-authored-by: Jared Parsons <jared@popcornbear.org>
jaredpar · Nov 28, 2023 · 5ef1ead · 5ef1ead
1 parent e034e6f
commit 5ef1ead
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Basic.CompilerLog.UnitTests/CompilerLogFixture.cs b/src/Basic.CompilerLog.UnitTests/CompilerLogFixture.cs
@@ -48,6 +48,8 @@ public sealed class CompilerLogFixture : IDisposable
     /// </summary>
     internal Lazy<string> ClassLibMultiComplogPath { get; }
 
+    internal Lazy<string> ConsoleVisualBasicComplogPath { get; }
+
     internal Lazy<string>? WpfAppComplogPath { get; }
 
     /// <summary>
@@ -65,10 +67,10 @@ public CompilerLogFixture(IMessageSink messageSink)
         ComplogDirectory = Path.Combine(StorageDirectory, "logs");
         Directory.CreateDirectory(ComplogDirectory);
 
-        var testArtifactsDir = Environment.GetEnvironmentVariable("TEST_ARTIFACTS_DIR");
+        var testArtifactsDir = Environment.GetEnvironmentVariable("TEST_ARTIFACTS_PATH");
         if (testArtifactsDir is not null)
         {
-            testArtifactsDir = Path.Combine(testArtifactsDir, RuntimeInformation.FrameworkDescription);
+            testArtifactsDir = Path.Combine(testArtifactsDir, Guid.NewGuid().ToString("N"));
             Directory.CreateDirectory(testArtifactsDir);
         }
 
@@ -150,6 +152,12 @@ partial class Util {
             RunDotnetCommand($"new console --name example-no-generator --output .", scratchPath);
             RunDotnetCommand("build -bl -nr:false", scratchPath);
         });
+
+        ConsoleVisualBasicComplogPath = WithBuild("console-vb.complog", void (string scratchPath) =>
+        {
+            RunDotnetCommand($"new console --name console-vb --language VB --output .", scratchPath);
+            RunDotnetCommand("build -bl -nr:false", scratchPath);
+        });
 
         ConsoleComplexComplogPath = WithBuild("console-complex.complog", void (string scratchPath) =>
         {

diff --git a/src/Basic.CompilerLog.Util/Serialize/MessagePackUtil.cs b/src/Basic.CompilerLog.Util/Serialize/MessagePackUtil.cs
@@ -189,7 +189,7 @@ internal static VisualBasicParseOptions CreateVisualBasicParseOptions(ParseOptio
     {
         return new VisualBasicParseOptions
         (
-            languageVersion: basicPack.LanguageVersion,
+            languageVersion: basicPack.SpecifiedLanguageVersion,
             documentationMode: optionsPack.DocumentationMode,
             kind: optionsPack.Kind,
             preprocessorSymbols: basicPack.PreprocessorSymbols