makit 0.0.128 → 0.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92575732a43ee635c4de11b27dfbb605a290f34cfbf912ee03f86ac1d58cb2a
-  data.tar.gz: db478edfa8de19f8e5ec1765f12e4c55b2493b2b338ab0cc6d0076a218405234
+  metadata.gz: '0621283549942c0c4d2cad1479716f15baa95683610100d19ccdce504d59c7e6'
+  data.tar.gz: a5d3a378e509f16717d52c00759213718d364f67114bd916aff530ff45dba927
 SHA512:
-  metadata.gz: de35fbdb8ffbf5c343253ca900d2fe7d70718937f5090436481fbb3b0580fa654cb671ce0800d3239068eb8a48744ad41a0b4a16d4b69342bf36103d6ea193b8
-  data.tar.gz: b8635f320eecf3a5cc0c7c5bca80b967224fddf490235f525f20593609b2d02747e5d954ae14fa7d08470b81ba18fd9b5886fc916061ab1a68c2128f0e1deda1
+  metadata.gz: 46399a0009c96b0834222c940d25d0b9284e708240290efc317fe0840cc6d9a10ee6ace8bb1fb324f463f1de932e7b6f114ae4fd3ee8cbb8c358d476259002c4
+  data.tar.gz: 1fc7149896202a6bbb7619d3b5354e460edcfc210bd972d22eb5b679eb998f48c459520974d64d3db9bcff189934700e321380a8ef0412270a36152b970c9d59

data/lib/makit/configuration/dotnet_project.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Makit
+  module Configuration
+    # Project configuration management
+    class DotNetProject
+      attr_accessor :name, :output_dir, :frameworks, :template
+    end
+  end
+end

data/lib/makit/configuration/project.rb

@@ -7,6 +7,7 @@ module Makit
     # Project configuration management
     class Project
       attr_accessor :git_remote_url, :name, :version, :project_type, :steps, :authors, :description, :license_expression
+      attr_accessor :dotnet_projects
 
       def initialize(name, version = nil, project_type = nil)
         # Support both keyword arguments and positional arguments for compatibility

data/lib/makit/setup/classlib.rb

@@ -9,6 +9,13 @@ module Makit
         # puts "Setting up Nuget project..."
         project = Makit::Configuration::Project.default
 
+        dotnet_project_directory = "source/#{project.name}"
+        dotnet_project = Makit::Configuration::DotNetProject.new
+        dotnet_project.name = project.name
+        dotnet_project.template = "classlib"
+        dotnet_project.output_dir = dotnet_project_directory
+        dotnet_project.frameworks = ["net8.0", "net8.0-browser"]
+
         project_filename = "source/#{project.name}/#{project.name}.csproj"
         if (!File.exist?(project_filename))
           Makit::DotNet::Project.new_project("classlib", project.name, "source/#{project.name}", "--framework net8.0")
@@ -22,10 +29,10 @@ module Makit
                                             project.license_expression)
         end
 
-        test_project_filename = "tests/#{project.name}/#{project.name}.Tests.csproj"
+        test_project_filename = "tests/#{project.name}.Tests/#{project.name}.Tests.csproj"
         if (File.exist?(test_project_filename))
-          Makit::DotNet::Project.new_project("TUnit", "#{project.name}.Tests", "tests/#{project.name}")
-          dotnet_project = Makit::DotNet::Project.new("tests/#{project.name}/#{project.name}.Tests.csproj")
+          Makit::DotNet::Project.new_project("TUnit", "#{project.name}.Tests", "tests/#{project.name}.Tests")
+          dotnet_project = Makit::DotNet::Project.new("tests/#{project.name}.Tests/#{project.name}.Tests.csproj")
           # set the version to project.version
           dotnet_project.set_version(project.version)
           # set the frameworks = ["net8.0","net8.0-browser"]
@@ -56,9 +63,9 @@ module Makit
         build_commands = []
         build_commands << "dotnet restore #{project.name}.slnx" if File.exist?("#{project.name}.slnx")
         build_commands << "dotnet build source/#{project.name}/#{project.name}.csproj --configuration Release"
-        build_commands << "dotnet build tests/#{project.name}/#{project.name}.Tests.csproj --configuration Release"
+        build_commands << "dotnet build tests/#{project.name}.Tests/#{project.name}.Tests.csproj --configuration Release"
         build_commands << "dotnet pack source/#{project.name}/#{project.name}.csproj --configuration Release --output artifacts/Packages"
-        build_commands << "dotnet pack tests/#{project.name}/#{project.name}.Tests.csproj --configuration Release --output artifacts/Packages"
+        build_commands << "dotnet pack tests/#{project.name}.Tests/#{project.name}.Tests.csproj --configuration Release --output artifacts/Packages"
         steps = project.steps
         if steps.any? { |step| step.name == "build" }
           build_step = steps.find { |step| step.name == "build" }

data/lib/makit/setup/razorclasslib.rb

@@ -8,38 +8,48 @@ module Makit
       def self.run
         # puts "Setting up Nuget project..."
         project = Makit::Configuration::Project.default
-        Makit::DotNet::Project.new_project("razorclasslib", project.name, "source/#{project.name}",
-                                           "--framework net8.0")
-        dotnet_project = Makit::DotNet::Project.new("source/#{project.name}/#{project.name}.csproj")
-        # set the version to project.version
-        dotnet_project.set_version(project.version)
-        # set the frameworks = ["net8.0","net8.0-browser"]
-        dotnet_project.set_target_frameworks(["net8.0", "net8.0-browser"])
-        # set the nuget metadata
-        dotnet_project.set_nuget_metadata(project.name, project.authors, project.description,
-                                          project.license_expression)
-        Makit::DotNet::Project.new_project("TUnit", "#{project.name}.Tests", "tests/#{project.name}")
-        dotnet_project = Makit::DotNet::Project.new("tests/#{project.name}/#{project.name}.Tests.csproj")
-        # set the version to project.version
-        dotnet_project.set_version(project.version)
-        # set the frameworks = ["net8.0","net8.0-browser"]
-        dotnet_project.set_target_frameworks(["net8.0", "net8.0-browser"])
-        # set the nuget metadata
-        dotnet_project.set_nuget_metadata("#{project.name}.Tests", project.authors, project.description,
-                                          project.license_expression)
-        Makit::DotNet::Project.add_reference("tests/#{project.name}/#{project.name}.Tests.csproj",
-                                             "source/#{project.name}/#{project.name}.csproj")
+
+        project_filename = "source/#{project.name}/#{project.name}.csproj"
+        if (!File.exist?(project_filename))
+          Makit::DotNet::Project.new_project("razorclasslib", project.name, "source/#{project.name}",
+                                             "--framework net8.0")
+          dotnet_project = Makit::DotNet::Project.new("source/#{project.name}/#{project.name}.csproj")
+          # set the version to project.version
+          dotnet_project.set_version(project.version)
+          # set the frameworks = ["net8.0","net8.0-browser"]
+          dotnet_project.set_target_frameworks(["net8.0", "net8.0-browser"])
+          # set the nuget metadata
+          dotnet_project.set_nuget_metadata(project.name, project.authors, project.description,
+                                            project.license_expression)
+        end
+
+        test_project_filename = "tests/#{project.name}.Tests/#{project.name}.Tests.csproj"
+        if (File.exist?(test_project_filename))
+          Makit::DotNet::Project.new_project("TUnit", "#{project.name}.Tests", "tests/#{project.name}")
+          dotnet_project = Makit::DotNet::Project.new("tests/#{project.name}/#{project.name}.Tests.csproj")
+          # set the version to project.version
+          dotnet_project.set_version(project.version)
+          # set the frameworks = ["net8.0","net8.0-browser"]
+          dotnet_project.set_target_frameworks(["net8.0", "net8.0-browser"])
+          # set the nuget metadata
+          dotnet_project.set_nuget_metadata("#{project.name}.Tests", project.authors, project.description,
+                                            project.license_expression)
+          Makit::DotNet::Project.add_reference("tests/#{project.name}/#{project.name}.Tests.csproj",
+                                               "source/#{project.name}/#{project.name}.csproj")
+        end
         update_build_step(project)
         update_test_step(project)
 
         project.save
 
         # Setup the sln, then slnx
-        Makit::DotNet.new_solution(project.name)
-        Makit::DotNet.sln_add_projects(project.name)
-        # migrate the sln to slnx
-        "dotnet sln migrate #{project.name}.sln".run
-        FileUtils.rm_f("#{project.name}.sln") if File.exist?("#{project.name}.slnx")
+        if (!File.exist?("#{project.name}.slnx"))
+          Makit::DotNet.new_solution(project.name)
+          Makit::DotNet.sln_add_projects(project.name)
+          # migrate the sln to slnx
+          "dotnet sln migrate #{project.name}.sln".run
+          FileUtils.rm_f("#{project.name}.sln") if File.exist?("#{project.name}.slnx")
+        end
         Makit::Logging.default_logger.debug("Project setup completed")
       end
 

data/lib/makit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Makit
-  VERSION = "0.0.128"
+  VERSION = "0.0.130"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.128
+  version: 0.0.130
 platform: ruby
 authors:
 - Your Name
@@ -195,6 +195,7 @@ files:
 - lib/makit/commands/strategies/base.rb
 - lib/makit/commands/strategies/synchronous.rb
 - lib/makit/configuration.rb
+- lib/makit/configuration/dotnet_project.rb
 - lib/makit/configuration/gitlab_helper.rb
 - lib/makit/configuration/project.rb
 - lib/makit/configuration/rakefile_helper.rb