NSwag v14 (preview) (RicoSuter#3758)

* v14 * Replace DotLiquid with Fluid * update templates to follow strict liquid syntax * net461 minimum full framework * Fixes * Refactoring * Fix tests * Remove legacy web api * Update * Fixes * Fix * Fixes * Fix * Remove .net 2.0 sample * fix tests * Upgrade to net462 * remove files * fix dependencies * update ui * remove more unused code * add support for preview publish * use njs preview * update dependencies * up * up * fix build * remove njs * up * up * cleanup * remove project * use full version for npm * add .net 7 * up * remove .net 5 * up * update launchsetings * use njs p2 * fix * Revert "update launchsetings" This reverts commit 4755081. * fix typo * fix generator * Revert "Revert "update launchsetings"" This reverts commit c8f634f. * update njs * disable npm publish for now * dont publish previews to npm * remove old sample projects * update pipeline * update build * remove * add libs * fix build and add tests * remove old targets --------- Co-authored-by: Marko Lahma <[email protected]> Co-authored-by: Rico Suter <[email protected]>
lahma · Jan 20, 2024 · 245b6ae · 245b6ae
1 parent dedf9c9
commit 245b6ae
Show file tree

Hide file tree

Showing 839 changed files with 1,892 additions and 222,522 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -91,13 +91,10 @@
               "Clean",
               "Compile",
               "InstallDependencies",
-              "IntegrationTest",
               "Pack",
               "Publish",
               "Restore",
-              "Samples",
-              "Test",
-              "UnitTest"
+              "Test"
             ]
           }
         },
@@ -114,13 +111,10 @@
               "Clean",
               "Compile",
               "InstallDependencies",
-              "IntegrationTest",
               "Pack",
               "Publish",
               "Restore",
-              "Samples",
-              "Test",
-              "UnitTest"
+              "Test"
             ]
           }
         },

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -71,7 +71,6 @@ steps:
     msbuildArchitecture: 'x86'
     configuration: '$(BuildConfiguration)'
 
-
 - task: VSTest@2
   displayName: 'Run tests'
   inputs:

diff --git a/build/00_Install.bat b/build/00_Install.bat
diff --git a/build/01_Build.bat b/build/01_Build.bat
diff --git a/build/02_RunUnitTests.bat b/build/02_RunUnitTests.bat
diff --git a/build/03_RunIntegrationTests.bat b/build/03_RunIntegrationTests.bat
diff --git a/build/04_Publish.bat b/build/04_Publish.bat
diff --git a/build/Build.Pack.cs b/build/Build.Pack.cs
@@ -22,7 +22,7 @@ public partial class Build
     // logic from 01_Build.bat
     Target Pack => _ => _
         .DependsOn(Compile)
-        .After(Test, IntegrationTest, UnitTest, Samples)
+        .After(Test)
         .Produces(ArtifactsDirectory / "*.*")
         .Executes(() =>
         {
@@ -123,7 +123,7 @@ public partial class Build
             // patch npm version
             var npmPackagesFile = SourceDirectory / "NSwag.Npm" / "package.json";
             content = TextTasks.ReadAllText(npmPackagesFile);
-            content = Regex.Replace(content, @"""version"": "".*""", @"""version"": """ + VersionPrefix + @"""");
+            content = Regex.Replace(content, @"""version"": "".*""", @"""version"": """ + nugetVersion + @"""");
             TextTasks.WriteAllText(npmPackagesFile, content);
 
             // ZIP directories

diff --git a/build/Build.Publish.cs b/build/Build.Publish.cs
@@ -49,17 +49,21 @@ public partial class Build
                         Path.Combine(userDirectory, ".npmrc"),
                         "//registry.npmjs.org/:_authToken=" + NpmAuthToken + "\n");
 
-                    var outputs = Npm("publish", SourceDirectory / "NSwag.Npm", logOutput: false);
-
-                    foreach (var output in outputs.Where(o => !o.Text.Contains("npm notice")))
+                    // do not publish preview packages to npm
+                    if (string.IsNullOrEmpty(VersionSuffix))
                     {
-                        if (output.Type == OutputType.Std)
-                        {
-                            Serilog.Log.Information(output.Text);
-                        }
-                        else
+                        var outputs = Npm("publish", SourceDirectory / "NSwag.Npm", logOutput: false);
+
+                        foreach (var output in outputs.Where(o => !o.Text.Contains("npm notice")))
                         {
-                            Serilog.Log.Error(output.Text);
+                            if (output.Type == OutputType.Std)
+                            {
+                                Serilog.Log.Information(output.Text);
+                            }
+                            else
+                            {
+                                Serilog.Log.Error(output.Text);
+                            }
                         }
                     }
                 }