Project updates (#25)

Enhancements: - Enable auto updating compiler tool by the VSCode language extension Technical - Migrate tests to central project management
degory · Apr 2, 2024 · d1724f1 · d1724f1
1 parent 92a3c62
commit d1724f1
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 42 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,7 +1,11 @@
 {
 	"image": "ghcr.io/degory/ghul/devcontainer:dotnet",
 	"containerUser": "vscode",
-	"extensions": [
-		"degory.ghul"
-	]
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"degory.ghul"
+			]
+		}
+	}
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.3.0-alpha.1</Version>
+    <Version>0.3.0-alpha.5</Version>
   </PropertyGroup>
 </Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 degory
+Copyright (c) 2024 degory
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/templates/ghul-classlib/.config/dotnet-tools.json b/templates/ghul-classlib/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "ghul.compiler": {
-      "version": "0.7.5",
+      "version": "0.8.35",
       "commands": [
         "ghul-compiler"
       ]

diff --git a/templates/ghul-classlib/.template.config/template.json b/templates/ghul-classlib/.template.config/template.json
@@ -20,5 +20,5 @@
         }
       ]
     }
-  ]
+  ] 
 }
diff --git a/templates/ghul-classlib/Directory.Build.props b/templates/ghul-classlib/Directory.Build.props
@@ -1,9 +1,11 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.0-alpha.1</Version>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ghul.runtime" />
+    <GhulSources Include="src/**/*.ghul" />
   </ItemGroup>
 </Project>
diff --git a/templates/ghul-classlib/Directory.Packages.props b/templates/ghul-classlib/Directory.Packages.props
@@ -1,6 +1,5 @@
 <Project>
   <ItemGroup>
-    <!-- ghūl runtime -->
-    <PackageVersion Include="ghul.runtime" Version="1.3.1" />
+    <PackageVersion Include="ghul.runtime" Version="1.3.3" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/templates/ghul-classlib/ghul-classlib.ghulproj b/templates/ghul-classlib/ghul-classlib.ghulproj
@@ -2,15 +2,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
     <PackageId>example.classlib</PackageId>
+    <Version>0.0.1-alpha.1</Version>
 
-    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
     <PackageOutputPath>./nupkg</PackageOutputPath>
   </PropertyGroup>
-
-  <ItemGroup>
-    <GhulSources Include="src/**/*.ghul" />
-  </ItemGroup>
 </Project>
diff --git a/templates/ghul-classlib/ghul.json b/templates/ghul-classlib/ghul.json
@@ -0,0 +1,3 @@
+{
+    "update_compiler_tool": true
+}
diff --git a/templates/ghul-classlib/src/ghul-classlib.ghul b/templates/ghul-classlib/src/ghul-classlib.ghul
@@ -9,6 +9,7 @@ namespace ClassLibTemplate is
         _writer: IO.TextWriter;
 
         init(writer: IO.TextWriter) is
+            assert writer? else "writer is null";
             _writer = writer;
         si
 

diff --git a/templates/ghul-console/.config/dotnet-tools.json b/templates/ghul-console/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "ghul.compiler": {
-      "version": "0.7.5",
+      "version": "0.8.35",
       "commands": [
         "ghul-compiler"
       ]

diff --git a/templates/ghul-console/Directory.Build.props b/templates/ghul-console/Directory.Build.props
@@ -1,9 +1,11 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.0-alpha.1</Version>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ghul.runtime" />
+    <GhulSources Include="src/**/*.ghul" />
   </ItemGroup>
 </Project>
diff --git a/templates/ghul-console/Directory.Packages.props b/templates/ghul-console/Directory.Packages.props
@@ -1,6 +1,5 @@
 <Project>
   <ItemGroup>
-    <!-- ghūl runtime -->
-    <PackageVersion Include="ghul.runtime" Version="1.3.1" />
+    <PackageVersion Include="ghul.runtime" Version="1.3.3" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/templates/ghul-console/ghul-console.ghulproj b/templates/ghul-console/ghul-console.ghulproj
@@ -2,12 +2,5 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-
-    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
   </PropertyGroup>
-
-  <ItemGroup>
-    <GhulSources Include="src/**/*.ghul" />
-  </ItemGroup>
 </Project>
diff --git a/templates/ghul-console/ghul.json b/templates/ghul-console/ghul.json
@@ -0,0 +1,3 @@
+{
+    "update_compiler_tool": true
+}
diff --git a/tests/ghul-classlib/.config/dotnet-tools.json b/tests/ghul-classlib/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "ghul.compiler": {
-      "version": "0.7.5",
+      "version": "0.8.35",
       "commands": [
         "ghul-compiler"
       ]

diff --git a/tests/ghul-classlib/Directory.Build.props b/tests/ghul-classlib/Directory.Build.props
@@ -1,5 +1,11 @@
 <Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="ghul.runtime" Version="1.3.1" />
+    <PackageReference Include="ghul.runtime" />
+    <GhulSources Include="src/**/*.ghul" />
   </ItemGroup>
 </Project>
diff --git a/tests/ghul-classlib/Directory.Packages.props b/tests/ghul-classlib/Directory.Packages.props
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="ghul.runtime" Version="1.3.3" />
+    <PackageVersion Include="example.classlib" Version="0.0.1-alpha.1" />
+  </ItemGroup>
+</Project>
diff --git a/tests/ghul-classlib/tests.ghul b/tests/ghul-classlib/tests.ghul
@@ -15,9 +15,9 @@ namespace ClassLibTemplate.Tests is
         Given_a_TextWriter__Greeter_greet__should_write_Hello_world_to_that_writer() is
             @test()
 
-            let string_writer = new IO.StringWriter();
+            let string_writer = IO.StringWriter();
 
-            let test_object = new HELLO_WORLD_GREETER(string_writer);
+            let test_object = HELLO_WORLD_GREETER(string_writer);
 
             test_object.greet();
 

diff --git a/tests/ghul-classlib/tests.ghulproj b/tests/ghul-classlib/tests.ghulproj
@@ -3,17 +3,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <Version>0.0.1-alpha.1</Version>
-
-    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
   </PropertyGroup>
 
   <ItemGroup>
-    <GhulSources Include="**/*.ghul" />
-
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-
-    <PackageReference Include="example.classlib" Version="0.1.0-alpha.1" />
+    <PackageReference Include="example.classlib" />
   </ItemGroup>
 </Project>