Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NSwag v14 (preview) #3758

Merged
merged 62 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
003c373
v14
RicoSuter Nov 11, 2021
b764477
Merge
RicoSuter Nov 17, 2021
bd7e4eb
Replace DotLiquid with Fluid
lahma Mar 28, 2021
945f1de
Fixes
RicoSuter Nov 18, 2021
f233b06
Refactoring
RicoSuter Nov 18, 2021
a93899c
Merge
RicoSuter Nov 18, 2021
b92608e
Fix tests
RicoSuter Nov 18, 2021
8cfd01d
Remove legacy web api
RicoSuter Nov 18, 2021
6682cda
Update
RicoSuter Nov 18, 2021
acfac2e
Merge
RicoSuter Nov 22, 2021
d31c340
Merge
RicoSuter Nov 25, 2021
fd83e9b
Fixes
RicoSuter Nov 25, 2021
ca9da56
Merge
RicoSuter Nov 30, 2021
35094a6
Merge
RicoSuter Dec 3, 2021
62b14df
Fix
RicoSuter Dec 3, 2021
7d08419
Merge
RicoSuter Dec 9, 2021
e0e2786
Merge
RicoSuter Oct 21, 2022
7728ffc
Fixes
RicoSuter Oct 21, 2022
02525ff
Merge
RicoSuter Dec 10, 2022
76036d6
Fix
RicoSuter Dec 11, 2022
93620c0
Remove .net 2.0 sample
RicoSuter Dec 11, 2022
5e337bd
merge
Aug 20, 2023
0fba21f
fix tests
Aug 20, 2023
16708f1
Upgrade to net462
Aug 20, 2023
f7c735d
remove files
Aug 20, 2023
0270524
fix dependencies
RicoSuter Sep 22, 2023
206161d
merge
RicoSuter Sep 22, 2023
bdff6cc
update ui
RicoSuter Sep 25, 2023
9668c43
remove more unused code
Sep 25, 2023
c34e31e
add support for preview publish
Sep 25, 2023
91ea0b1
use njs preview
Sep 25, 2023
8476a5c
update dependencies
Sep 25, 2023
e40b9fb
up
Sep 25, 2023
6698af3
up
Sep 25, 2023
6b55594
fix build
Sep 25, 2023
77a8461
remove njs
Sep 25, 2023
bcbeeaf
up
Sep 25, 2023
4e890d2
up
Sep 25, 2023
6ebbbaa
cleanup
Sep 25, 2023
333c25c
remove project
RicoSuter Sep 25, 2023
249f9a6
use full version for npm
RicoSuter Sep 25, 2023
28bd3a6
add .net 7
RicoSuter Sep 25, 2023
1572512
up
RicoSuter Sep 25, 2023
c2a27c4
remove .net 5
Sep 26, 2023
c34a04a
up
Sep 26, 2023
4755081
update launchsetings
Sep 26, 2023
8abcb64
use njs p2
Sep 26, 2023
17f70fa
fix
Sep 26, 2023
c8f634f
Revert "update launchsetings"
Sep 26, 2023
0360249
fix typo
Sep 26, 2023
a7b6986
fix generator
Sep 26, 2023
6dccf3e
Revert "Revert "update launchsetings""
Sep 26, 2023
3f85a38
update njs
Sep 26, 2023
b680b56
disable npm publish for now
Sep 26, 2023
a907ab2
dont publish previews to npm
Sep 26, 2023
e59fde9
remove old sample projects
Sep 26, 2023
a129563
update pipeline
Sep 26, 2023
0436494
update build
Sep 26, 2023
7777c36
remove
Sep 26, 2023
9948583
add libs
Sep 26, 2023
790bfd7
fix build and add tests
Sep 26, 2023
9b87866
remove old targets
Sep 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 2 additions & 8 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,10 @@
"Clean",
"Compile",
"InstallDependencies",
"IntegrationTest",
"Pack",
"Publish",
"Restore",
"Samples",
"Test",
"UnitTest"
"Test"
]
}
},
Expand All @@ -114,13 +111,10 @@
"Clean",
"Compile",
"InstallDependencies",
"IntegrationTest",
"Pack",
"Publish",
"Restore",
"Samples",
"Test",
"UnitTest"
"Test"
]
}
},
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ steps:
msbuildArchitecture: 'x86'
configuration: '$(BuildConfiguration)'


- task: VSTest@2
displayName: 'Run tests'
inputs:
Expand Down
3 changes: 0 additions & 3 deletions build/00_Install.bat

This file was deleted.

3 changes: 0 additions & 3 deletions build/01_Build.bat

This file was deleted.

3 changes: 0 additions & 3 deletions build/02_RunUnitTests.bat

This file was deleted.

3 changes: 0 additions & 3 deletions build/03_RunIntegrationTests.bat

This file was deleted.

3 changes: 0 additions & 3 deletions build/04_Publish.bat

This file was deleted.

4 changes: 2 additions & 2 deletions build/Build.Pack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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(() =>
{
Expand Down Expand Up @@ -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
Expand Down
22 changes: 13 additions & 9 deletions build/Build.Publish.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
}
Expand Down
Loading
Loading