Merge pull request #45 from servicetitan/dev/migrate-to-13-18-0

Migrate to 13.18.0

Author: shuruev

.github/workflows/build.yml

@@ -32,19 +32,24 @@ jobs:
     name: windows-2022
     runs-on: windows-2022
     steps:
+      - name: 'Allow long file path'
+        run: git config --system core.longpaths true
       - uses: actions/checkout@v1
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 2.1.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 3.1.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.*
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:

.github/workflows/pr.yml

@@ -30,19 +30,24 @@ jobs:
     name: windows-2022
     runs-on: windows-2022
     steps:
+      - name: 'Allow long file path'
+        run: git config --system core.longpaths true
       - uses: actions/checkout@v1
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 2.1.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 3.1.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.*
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:

azure-pipelines.yml

@@ -15,6 +15,11 @@ variables:
   Projects: 'src/NSwag.sln'
 
 steps:
+- task: CmdLine@2
+  displayName: 'Allow long file path'
+  inputs:
+    script: 'git config --system core.longpaths true'
+- checkout: self
 # Install required SDKs and tools
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDK'
@@ -25,6 +30,15 @@ steps:
     performMultiLevelLookup: true
     useGlobalJson: true
 
+- task: UseDotNet@2
+  displayName: 'Install .NET Core SDK'
+  inputs:
+    packageType: 'sdk'
+    version: '7.0.x'
+    includePreviewVersions: true
+    performMultiLevelLookup: true
+    useGlobalJson: true
+
 - task: CmdLine@2
   displayName: 'Install DNT'
   inputs:
@@ -93,4 +107,4 @@ steps:
   inputs:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
-    publishLocation: 'Container'
+    publishLocation: 'Container'

build/Build.CI.GitHubActions.cs

@@ -45,26 +45,40 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
         var job = base.GetJobs(image, relevantTargets);
 
         var newSteps = new List<GitHubActionsStep>(job.Steps);
-        foreach (var version in new[] { "6.0.*", "5.0.*", "3.1.*", "2.1.*" })
+        foreach (var version in new[] { "7.0.*", "6.0.*", "5.0.*", "3.1.*", "2.1.*" })
         {
             newSteps.Insert(1, new GitHubActionsSetupDotNetStep
             {
                 Version = version
             });
         }
+        
+        newSteps.Insert(0, new GitHubActionsConfigureLongPathsStep());
 
         job.Steps = newSteps.ToArray();
         return job;
     }
 }
 
+class GitHubActionsConfigureLongPathsStep : GitHubActionsStep
+{
+    public override void Write(CustomFileWriter writer)
+    {
+        writer.WriteLine("- name: 'Allow long file path'");
+        using (writer.Indent())
+        {
+            writer.WriteLine("run: git config --system core.longpaths true");
+        }
+    }
+}
+
 class GitHubActionsSetupDotNetStep : GitHubActionsStep
 {
     public string Version { get; init; }
 
     public override void Write(CustomFileWriter writer)
     {
-        writer.WriteLine("- uses: actions/setup-dotnet@v1");
+        writer.WriteLine("- uses: actions/setup-dotnet@v3");
 
         using (writer.Indent())
         {

build/Build.Pack.cs

@@ -89,10 +89,15 @@ public partial class Build
             // gather relevant artifacts
             Serilog.Log.Information("Package nuspecs");
 
+            var apiDescriptionClientNuSpec = SourceDirectory / "NSwag.ApiDescription.Client" / "NSwag.ApiDescription.Client.nuspec";
+            var content = TextTasks.ReadAllText(apiDescriptionClientNuSpec);
+            content = content.Replace("<dependency id=\"NSwag.MSBuild\" version=\"1.0.0\" />", "<dependency id=\"NSwag.MSBuild\" version=\"" + VersionPrefix + "\" />");
+            TextTasks.WriteAllText(apiDescriptionClientNuSpec, content);
+
             var nuspecs = new[]
             {
+                apiDescriptionClientNuSpec,
                 SourceDirectory / "NSwag.MSBuild" / "NSwag.MSBuild.nuspec",
-                SourceDirectory / "NSwag.ApiDescription.Client" / "NSwag.ApiDescription.Client.nuspec",
                 SourceDirectory / "NSwagStudio.Chocolatey" / "NSwagStudio.nuspec"
             };
 
@@ -117,7 +122,7 @@ public partial class Build
 
             // patch npm version
             var npmPackagesFile = SourceDirectory / "NSwag.Npm" / "package.json";
-            var content = TextTasks.ReadAllText(npmPackagesFile);
+            content = TextTasks.ReadAllText(npmPackagesFile);
             content = Regex.Replace(content, @"""version"": "".*""", @"""version"": """ + VersionPrefix + @"""");
             TextTasks.WriteAllText(npmPackagesFile, content);
 

build/Build.cs

@@ -239,7 +239,9 @@ protected override void OnBuildInitialized()
                 ("NSwag.Sample.NETCore31", "NetCore31"),
                 ("NSwag.Sample.NET50", "Net50"),
                 ("NSwag.Sample.NET60", "Net60"),
-                ("NSwag.Sample.NET60Minimal", "Net60")
+                ("NSwag.Sample.NET60Minimal", "Net60"),
+                ("NSwag.Sample.NET70", "Net70"),
+                ("NSwag.Sample.NET70Minimal", "Net70")
             };
 
             foreach (var (projectName, runtime) in dotnetTargets)
@@ -355,7 +357,7 @@ void PublishConsoleProject(Nuke.Common.ProjectModel.Project project, string[] ta
 
         PublishConsoleProject(consoleX86Project, new[] { "net461" });
         PublishConsoleProject(consoleProject, new[] { "net461" });
-        PublishConsoleProject(consoleCoreProject, new[] { "netcoreapp2.1", "netcoreapp3.1", "net5.0", "net6.0" });
+        PublishConsoleProject(consoleCoreProject, new[] { "netcoreapp2.1", "netcoreapp3.1", "net5.0", "net6.0", "net7.0" });
 
         void CopyConsoleBinaries(AbsolutePath target)
         {
@@ -371,6 +373,7 @@ void CopyConsoleBinaries(AbsolutePath target)
             CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp3.1" / "publish", target / "NetCore31");
             CopyDirectoryRecursively(consoleCoreDirectory / "net5.0" / "publish", target / "Net50");
             CopyDirectoryRecursively(consoleCoreDirectory / "net6.0" / "publish", target / "Net60");
+            CopyDirectoryRecursively(consoleCoreDirectory / "net7.0" / "publish", target / "Net70");
         }
 
         Serilog.Log.Information("Copy published Console for NSwagStudio");

build/_build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100",
     "rollForward": "latestMinor"
   }
 }

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>13.15.10</VersionPrefix>
+    <VersionPrefix>13.18.0</VersionPrefix>
 
     <Authors>Rico Suter</Authors>
     <Copyright>Copyright © Rico Suter, 2021</Copyright>

src/NSwag.Annotations/OpenApiOperationAttribute.cs

@@ -48,7 +48,7 @@ public OpenApiOperationAttribute(string operationId, string summary, string desc
         public string Description { get; private set; }
     }
 
-    /// <summary>Specifies the operation id.</summary>
+    /// <summary>Specifies the operation ID.</summary>
     [AttributeUsage(AttributeTargets.Method)]
     [Obsolete("Use " + nameof(OpenApiOperationAttribute) + " instead.")]
     public class SwaggerOperationAttribute : Attribute

src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.nuspec

@@ -15,8 +15,8 @@
     <repository type="git" url="https://github.com/RicoSuter/NSwag.git"/>
     <developmentDependency>true</developmentDependency>
     <dependencies>
-      <dependency id="Microsoft.Extensions.ApiDescription.Client" version="3.0.0" />
-      <dependency id="NSwag.MSBuild" version="13.14.5" />
+      <dependency id="Microsoft.Extensions.ApiDescription.Client" version="6.0.3" />
+      <dependency id="NSwag.MSBuild" version="1.0.0" />
     </dependencies>
     <references />
   </metadata>

src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets

@@ -8,6 +8,8 @@
         Condition="'$(TargetFramework)' == 'net5.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net50)/dotnet-nswag.dll"</_NSwagCommand>
     <_NSwagCommand
         Condition="'$(TargetFramework)' == 'net6.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net60)/dotnet-nswag.dll"</_NSwagCommand>
+    <_NSwagCommand
+        Condition="'$(TargetFramework)' == 'net7.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net70)/dotnet-nswag.dll"</_NSwagCommand>
   </PropertyGroup>
 
   <!-- OpenApiReference support for C# -->

src/NSwag.AspNet.Owin/SwaggerUi3/oauth2-redirect.html

@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
@@ -67,9 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
 </body>
 </html>

src/NSwag.AspNet.Owin/SwaggerUi3/swagger-ui-bundle.js

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
-    <PackageReference Include="NJsonSchema" Version="10.6.10" />
+    <PackageReference Include="NJsonSchema" Version="10.8.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NSwag.Annotations\NSwag.Annotations.csproj" />

src/NSwag.AspNet.Owin/SwaggerUi3/swagger-ui-es-bundle-core.js

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
     <PackageTags>Swagger Documentation AspNetCore NetCore TypeScript CodeGen</PackageTags>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
@@ -11,11 +11,12 @@
     <MicrosoftAspNetCoreMvcCorePackageVersion>1.0.6</MicrosoftAspNetCoreMvcCorePackageVersion>
     <MicrosoftAspNetCoreMvcFormattersJsonPackageVersion>1.0.6</MicrosoftAspNetCoreMvcFormattersJsonPackageVersion>
     <MicrosoftAspNetCoreStaticFilesPackageVersion>1.0.4</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftExtensionsApiDescriptionServerPackageVersion>3.0.0</MicrosoftExtensionsApiDescriptionServerPackageVersion>
+    <MicrosoftExtensionsApiDescriptionServerPackageVersion>6.0.3</MicrosoftExtensionsApiDescriptionServerPackageVersion>
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>[1.0.1, 6.0)</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31>[3.1, 4.0)</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31>
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5>[5, 6.0)</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5>
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6>[6.0.0, 7.0)</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7>[7.0.0, 8.0)</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7>
     <NETStandardLibraryPackageVersion>1.6.1</NETStandardLibraryPackageVersion>
     <SystemIOFileSystemPackageVersion>4.3.0</SystemIOFileSystemPackageVersion>
     <SystemXmlXPathXDocumentPackageVersion>4.0.1</SystemXmlXPathXDocumentPackageVersion>
@@ -54,6 +55,10 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6)" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NSwag.Annotations\NSwag.Annotations.csproj" />
     <ProjectReference Include="..\NSwag.Core\NSwag.Core.csproj" />
@@ -79,6 +84,7 @@
         microsoftExtensionsFileProvidersEmbeddedPackageVersionCore31=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31);
         microsoftExtensionsFileProvidersEmbeddedPackageVersionNet5=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5);
         microsoftExtensionsFileProvidersEmbeddedPackageVersionNet6=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6);
+        microsoftExtensionsFileProvidersEmbeddedPackageVersionNet7=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7);
         netStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion);
         systemIOFileSystemPackageVersion=$(SystemIOFileSystemPackageVersion);
         systemXmlXPathXDocumentPackageVersion=$(SystemXmlXPathXDocumentPackageVersion);

src/NSwag.AspNet.Owin/SwaggerUi3/swagger-ui-es-bundle.js

@@ -78,7 +78,16 @@
                 <dependency id="NSwag.Generation" version="$version$" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
                 <dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6$" exclude="Build,Analyzers" />
-            </group>            
+            </group>
+            <group targetFramework="net7.0">
+                <dependency id="NSwag.Annotations" version="$version$" exclude="Build,Analyzers" />
+                <dependency id="NSwag.Core" version="$version$" exclude="Build,Analyzers" />
+                <dependency id="NSwag.Core.Yaml" version="$version$" exclude="Build,Analyzers" />
+                <dependency id="NSwag.Generation.AspNetCore" version="$version$" exclude="Build,Analyzers" />
+                <dependency id="NSwag.Generation" version="$version$" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
+                <dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7$" exclude="Build,Analyzers" />
+            </group>
         </dependencies>
     </metadata>
     <files>
@@ -97,5 +106,7 @@
         <file src="bin\$configuration$\net5.0\NSwag.AspNetCore.xml" target="lib\net5.0\" />
         <file src="bin\$configuration$\net6.0\NSwag.AspNetCore.dll" target="lib\net6.0\" />
         <file src="bin\$configuration$\net6.0\NSwag.AspNetCore.xml" target="lib\net6.0\" />
+        <file src="bin\$configuration$\net7.0\NSwag.AspNetCore.dll" target="lib\net7.0\" />
+        <file src="bin\$configuration$\net7.0\NSwag.AspNetCore.xml" target="lib\net7.0\" />
     </files>
 </package>