Skip to content

Commit 3d1645f

Browse files
lahmalahma
authored
Use NET 8 SDK artifacts output (#4589)
1 parent 849bd27 commit 3d1645f

File tree

23 files changed

+208
-142
lines changed

23 files changed

+208
-142
lines changed

‎src/Directory.Build.props renamed to ‎Directory.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<!-- reduce package size by only including english resources -->
3232
<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
3333

34+
<UseArtifactsOutput>true</UseArtifactsOutput>
35+
3436
</PropertyGroup>
3537

3638
<ItemGroup>

‎build/Build.Pack.cs

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public partial class Build
3737
nugetVersion += "-" + VersionSuffix;
3838
}
3939

40-
ArtifactsDirectory.CreateOrCleanDirectory();
41-
4240
// it seems to cause some headache with publishing, so let's dotnet pack only files we know are suitable
4341
var projects = SourceDirectory.GlobFiles("**/*.csproj")
4442
.Where(x => !x.ToString().Contains("_build") &&

‎build/Build.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Build()
5656
AbsolutePath SourceDirectory => RootDirectory / "src";
5757
AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
5858

59-
AbsolutePath NSwagStudioBinaries => SourceDirectory / "NSwagStudio" / "bin" / Configuration;
59+
AbsolutePath NSwagStudioBinaries => ArtifactsDirectory / "bin" / "NSwagStudio" / Configuration;
6060
AbsolutePath NSwagNpmBinaries => SourceDirectory / "NSwag.Npm";
6161

6262
static bool IsRunningOnWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
@@ -75,7 +75,7 @@ string DetermineVersionPrefix()
7575
}
7676
else
7777
{
78-
var propsDocument = XDocument.Parse((SourceDirectory / "Directory.Build.props").ReadAllText());
78+
var propsDocument = XDocument.Parse((RootDirectory / "Directory.Build.props").ReadAllText());
7979
versionPrefix = propsDocument.Element("Project").Element("PropertyGroup").Element("VersionPrefix").Value;
8080
Serilog.Log.Information("Version prefix {VersionPrefix} read from Directory.Build.props", versionPrefix);
8181
}
@@ -241,16 +241,15 @@ void PublishConsoleProject(Project project, string[] targetFrameworks)
241241
void CopyConsoleBinaries(AbsolutePath target)
242242
{
243243
// take just exe from X86 as other files are shared with console project
244-
var consoleX86Directory = consoleX86Project.Directory / "bin" / Configuration / "net462" / "publish";
244+
var consoleX86Directory = ArtifactsDirectory / "publish" / consoleX86Project.Name / Configuration;
245245
CopyFileToDirectory(consoleX86Directory / "NSwag.x86.exe", target / "Win");
246246
CopyFileToDirectory(consoleX86Directory / "NSwag.x86.exe.config", target / "Win");
247247

248-
CopyDirectoryRecursively(consoleProject.Directory / "bin" / Configuration / "net462" / "publish", target / "Win", DirectoryExistsPolicy.Merge);
248+
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleProject.Name / Configuration, target / "Win", DirectoryExistsPolicy.Merge);
249249

250-
var consoleCoreDirectory = consoleCoreProject.Directory / "bin" / Configuration;
251-
CopyDirectoryRecursively(consoleCoreDirectory / "net6.0" / "publish", target / "Net60");
252-
CopyDirectoryRecursively(consoleCoreDirectory / "net7.0" / "publish", target / "Net70");
253-
CopyDirectoryRecursively(consoleCoreDirectory / "net8.0" / "publish", target / "Net80");
250+
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (Configuration + "_net6.0"), target / "Net60");
251+
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (Configuration + "_net7.0"), target / "Net70");
252+
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (Configuration + "_net7.0"), target / "Net80");
254253
}
255254

256255
Serilog.Log.Information("Copy published Console for NSwagStudio");

‎build/_build.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<NukeScriptDirectory>..</NukeScriptDirectory>
1010
<NukeTelemetryVersion>1</NukeTelemetryVersion>
1111
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
12+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
13+
<UseArtifactsOutput>false</UseArtifactsOutput>
14+
<NukeExcludeConfig>true</NukeExcludeConfig>
15+
<NukeExcludeDirectoryBuild>true</NukeExcludeDirectoryBuild>
16+
<NukeExcludeLogs>true</NukeExcludeLogs>
1217
</PropertyGroup>
1318

1419
<ItemGroup>

‎src/NSwag.Annotations/NSwag.Annotations.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4-
</PropertyGroup>
5-
6-
<PropertyGroup>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
85
</PropertyGroup>
96
</Project>

‎src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net462</TargetFramework>
4-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<DefineConstants>$(DefineConstants);AspNetOwin</DefineConstants>
66
</PropertyGroup>
77

‎src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net462</TargetFramework>
4-
</PropertyGroup>
5-
6-
<PropertyGroup>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
85
</PropertyGroup>
96

107
<ItemGroup>

‎src/NSwag.AspNetCore/NSwag.AspNetCore.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PackageTags>Swagger Documentation AspNetCore NetCore TypeScript CodeGen</PackageTags>
55
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
66
<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78

89
<!-- Execute PopulateNuspec fairly late. -->
910
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);PopulateNuspec</GenerateNuspecDependsOn>
@@ -23,10 +24,6 @@
2324
<SystemXmlXPathXDocumentPackageVersion>4.0.1</SystemXmlXPathXDocumentPackageVersion>
2425
</PropertyGroup>
2526

26-
<PropertyGroup>
27-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
28-
</PropertyGroup>
29-
3027
<ItemGroup>
3128
<None Include="..\..\assets\NuGetIcon.png" Pack="true" PackagePath="" />
3229
<EmbeddedResource Include="ReDoc\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />

‎src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec

+10-10
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
<file src="..\..\assets\NuGetIcon.png" target="NuGetIcon.png" />
7171
<file src="build\*" target="build\" />
7272
<file src="buildMultiTargeting\*" target="buildMultiTargeting\" />
73-
<file src="bin\$configuration$\net462\NSwag.AspNetCore.dll" target="lib\net462\" />
74-
<file src="bin\$configuration$\net462\NSwag.AspNetCore.xml" target="lib\net462\" />
75-
<file src="bin\$configuration$\netstandard2.0\NSwag.AspNetCore.dll" target="lib\netstandard2.0\" />
76-
<file src="bin\$configuration$\netstandard2.0\NSwag.AspNetCore.xml" target="lib\netstandard2.0\" />
77-
<file src="bin\$configuration$\net6.0\NSwag.AspNetCore.dll" target="lib\net6.0\" />
78-
<file src="bin\$configuration$\net6.0\NSwag.AspNetCore.xml" target="lib\net6.0\" />
79-
<file src="bin\$configuration$\net7.0\NSwag.AspNetCore.dll" target="lib\net7.0\" />
80-
<file src="bin\$configuration$\net7.0\NSwag.AspNetCore.xml" target="lib\net7.0\" />
81-
<file src="bin\$configuration$\net8.0\NSwag.AspNetCore.dll" target="lib\net8.0\" />
82-
<file src="bin\$configuration$\net8.0\NSwag.AspNetCore.xml" target="lib\net8.0\" />
73+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net462\NSwag.AspNetCore.dll" target="lib\net462\" />
74+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net462\NSwag.AspNetCore.xml" target="lib\net462\" />
75+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_netstandard2.0\NSwag.AspNetCore.dll" target="lib\netstandard2.0\" />
76+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_netstandard2.0\NSwag.AspNetCore.xml" target="lib\netstandard2.0\" />
77+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net6.0\NSwag.AspNetCore.dll" target="lib\net6.0\" />
78+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net6.0\NSwag.AspNetCore.xml" target="lib\net6.0\" />
79+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net7.0\NSwag.AspNetCore.dll" target="lib\net7.0\" />
80+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net7.0\NSwag.AspNetCore.xml" target="lib\net7.0\" />
81+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net8.0\NSwag.AspNetCore.dll" target="lib\net8.0\" />
82+
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net8.0\NSwag.AspNetCore.xml" target="lib\net8.0\" />
8383
</files>
8484
</package>

‎src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
4-
</PropertyGroup>
5-
6-
<PropertyGroup>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
85
</PropertyGroup>
96

107
<ItemGroup>

‎src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
4-
</PropertyGroup>
5-
6-
<PropertyGroup>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
85
</PropertyGroup>
96

107
<ItemGroup>

‎src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
4-
</PropertyGroup>
5-
6-
<PropertyGroup>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
85
</PropertyGroup>
96

107
<ItemGroup>

0 commit comments

Comments
 (0)