Skip to content

Commit 2aea0fd

Browse files
#4821 Cleanup packages to use those provided by framework (#4831)
1 parent ba6e932 commit 2aea0fd

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

src/NSwag.AspNetCore/NSwag.AspNetCore.csproj

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<MicrosoftAspNetCoreStaticFilesPackageVersion>1.0.4</MicrosoftAspNetCoreStaticFilesPackageVersion>
1515
<MicrosoftExtensionsApiDescriptionServerPackageVersion>8.0.14</MicrosoftExtensionsApiDescriptionServerPackageVersion>
1616
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>1.0.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
17-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8>8.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8>
18-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9>9.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9>
1917
<SystemIOFileSystemPackageVersion>4.3.0</SystemIOFileSystemPackageVersion>
2018
<SystemXmlXPathXDocumentPackageVersion>4.0.1</SystemXmlXPathXDocumentPackageVersion>
2119
</PropertyGroup>
@@ -38,14 +36,8 @@
3836
<PackageReference Include="System.Xml.XPath.XDocument" Version="$(SystemXmlXPathXDocumentPackageVersion)" />
3937
</ItemGroup>
4038

41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
39+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' ">
4240
<FrameworkReference Include="Microsoft.AspNetCore.App" />
43-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8)" />
44-
</ItemGroup>
45-
46-
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
47-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
48-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9)" />
4941
</ItemGroup>
5042

5143
<ItemGroup>
@@ -72,8 +64,6 @@
7264
microsoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion);
7365
microsoftExtensionsApiDescriptionServerPackageVersion=$(MicrosoftExtensionsApiDescriptionServerPackageVersion);
7466
microsoftExtensionsFileProvidersEmbeddedPackageVersion=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion);
75-
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet8=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8);
76-
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet9=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9);
7767
systemIOFileSystemPackageVersion=$(SystemIOFileSystemPackageVersion);
7868
systemXmlXPathXDocumentPackageVersion=$(SystemXmlXPathXDocumentPackageVersion);
7969
</NuspecProperties>

src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<dependency id="NSwag.Generation.AspNetCore" version="$version$" exclude="Build,Analyzers" />
4545
<dependency id="NSwag.Generation" version="$version$" exclude="Build,Analyzers" />
4646
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
47-
<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8$" exclude="Build,Analyzers" />
4847
</group>
4948
<group targetFramework="net9.0">
5049
<dependency id="NSwag.Annotations" version="$version$" exclude="Build,Analyzers" />
@@ -53,7 +52,6 @@
5352
<dependency id="NSwag.Generation.AspNetCore" version="$version$" exclude="Build,Analyzers" />
5453
<dependency id="NSwag.Generation" version="$version$" exclude="Build,Analyzers" />
5554
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
56-
<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9$" exclude="Build,Analyzers" />
5755
</group>
5856
</dependencies>
5957
</metadata>

src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@
1212
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="1.0.4" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
15+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' ">
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
19-
</ItemGroup>
20-
21-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
22-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
2517
</ItemGroup>
2618

2719
<ItemGroup>

0 commit comments

Comments
 (0)