Skip to content

Commit af877cc

Browse files
baywetbaywet
authored
Merge pull request #1365 from SimonCropp/cleanup-csproj
Cleanup csproj
2 parents 540f02b + add1b5a commit af877cc

File tree

10 files changed

+47
-142
lines changed

10 files changed

+47
-142
lines changed

‎Directory.Build.props

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
4+
<Authors>Microsoft</Authors>
5+
<Company>Microsoft</Company>
6+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
7+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
8+
<RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
9+
<PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11+
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
12+
<PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
13+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
14+
<PackageTags>OpenAPI .NET</PackageTags>
15+
</PropertyGroup>
16+
<!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
17+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
18+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<PackageReference
22+
Condition="!$(MSBuildProjectName.EndsWith('Tests'))"
23+
Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
24+
</ItemGroup>
25+
</Project>

‎src/Directory.Build.props

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,14 @@
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<PackAsTool>true</PackAsTool>
99
<Nullable>enable</Nullable>
10-
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
12-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
14-
<Authors>Microsoft</Authors>
15-
<Company>Microsoft</Company>
16-
<Title>Microsoft.OpenApi.Hidi</Title>
17-
<PackageId>Microsoft.OpenApi.Hidi</PackageId>
1810
<ToolCommandName>hidi</ToolCommandName>
1911
<PackageOutputPath>./../../artifacts</PackageOutputPath>
2012
<Version>1.3.0</Version>
2113
<Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
22-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
23-
<PackageTags>OpenAPI .NET</PackageTags>
24-
<RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
25-
<PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
26-
<AssemblyName>Microsoft.OpenApi.Hidi</AssemblyName>
27-
<RootNamespace>Microsoft.OpenApi.Hidi</RootNamespace>
2814
<SignAssembly>true</SignAssembly>
2915
<!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
3016
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3117
<NoWarn>$(NoWarn);NU5048;NU5104;CA1848;</NoWarn>
32-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3318
<PackageReadmeFile>readme.md</PackageReadmeFile>
3419
<AnalysisMode>All</AnalysisMode>
3520
</PropertyGroup>

‎src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
3+
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
7-
<PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
8-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
10-
<Authors>Microsoft</Authors>
11-
<Company>Microsoft</Company>
12-
<Title>Microsoft.OpenApi.Readers</Title>
13-
<PackageId>Microsoft.OpenApi.Readers</PackageId>
146
<Version>1.6.9</Version>
157
<Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
16-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
17-
<PackageTags>OpenAPI .NET</PackageTags>
18-
<RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
19-
<PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
20-
<AssemblyName>Microsoft.OpenApi.Readers</AssemblyName>
21-
<RootNamespace>Microsoft.OpenApi.Readers</RootNamespace>
228
<SignAssembly>true</SignAssembly>
239
<!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
2410
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2511
<NoWarn>NU5048</NoWarn>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2712
<PackageReadmeFile>README.md</PackageReadmeFile>
2813
</PropertyGroup>
2914

@@ -32,11 +17,6 @@
3217
<AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
3318
</PropertyGroup>
3419

35-
<!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
36-
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
37-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
38-
</PropertyGroup>
39-
4020
<ItemGroup>
4121
<PackageReference Include="SharpYaml" Version="2.1.0" />
4222
</ItemGroup>

‎src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<EnableWindowsTargeting>true</EnableWindowsTargeting>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
12-
<PrivateAssets>all</PrivateAssets>
13-
</PackageReference>
11+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302" PrivateAssets="all" />
1412
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
1513
</ItemGroup>
1614
<ItemGroup>

‎src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
3+
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>Latest</LangVersion>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
7-
<PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
8-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
10-
<Authors>Microsoft</Authors>
11-
<Company>Microsoft</Company>
12-
<Title>Microsoft.OpenApi</Title>
13-
<PackageId>Microsoft.OpenApi</PackageId>
146
<Version>1.6.9</Version>
157
<Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
16-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
17-
<PackageTags>OpenAPI .NET</PackageTags>
18-
<RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
19-
<PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
20-
<AssemblyName>Microsoft.OpenApi</AssemblyName>
21-
<RootNamespace>Microsoft.OpenApi</RootNamespace>
228
<SignAssembly>true</SignAssembly>
239
<!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
2410
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2511
<NoWarn>NU5048</NoWarn>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2712
<PackageReadmeFile>README.md</PackageReadmeFile>
2813
</PropertyGroup>
2914

@@ -32,11 +17,6 @@
3217
<AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
3318
</PropertyGroup>
3419

35-
<!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
36-
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
37-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
38-
</PropertyGroup>
39-
4020
<ItemGroup>
4121
<Compile Update="Properties\SRResource.Designer.cs">
4222
<DesignTime>True</DesignTime>

‎test/Microsoft.OpenApi.Hidi.Tests/Microsoft.OpenApi.Hidi.Tests.csproj

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,17 @@
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
9-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
109
<AnalysisMode>All</AnalysisMode>
1110
<NoWarn>CA2007</NoWarn>
1211
</PropertyGroup>
1312

1413
<ItemGroup>
15-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
1915
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
2016
<PackageReference Include="Moq" Version="4.20.69" />
2117
<PackageReference Include="xunit" Version="2.5.1" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
<PrivateAssets>all</PrivateAssets>
25-
</PackageReference>
26-
<PackageReference Include="coverlet.collector" Version="6.0.0">
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
<PrivateAssets>all</PrivateAssets>
29-
</PackageReference>
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
19+
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
3020
</ItemGroup>
3121

3222
<ItemGroup>

‎test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
5-
<Authors></Authors>
6-
<Company>Microsoft</Company>
7-
<Product>Microsoft.OpenApi.Readers.Tests</Product>
8-
<PackageId>Microsoft.OpenApi.Readers.Tests</PackageId>
9-
<Description>Tests for Microsoft.OpenApi.Readers</Description>
10-
<AssemblyName>Microsoft.OpenApi.Readers.Tests</AssemblyName>
11-
<RootNamespace>Microsoft.OpenApi.Readers.Tests</RootNamespace>
125
<SignAssembly>true</SignAssembly>
136
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
147
</PropertyGroup>
@@ -267,27 +260,14 @@
267260
</ItemGroup>
268261

269262
<ItemGroup>
270-
<PackageReference Include="coverlet.collector" Version="6.0.0">
271-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
272-
<PrivateAssets>all</PrivateAssets>
273-
</PackageReference>
274-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
275-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
276-
<PrivateAssets>all</PrivateAssets>
277-
</PackageReference>
263+
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
264+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
278265
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
279-
<PackageReference Include="FluentAssertions" Version="6.12.0">
280-
</PackageReference>
281-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
282-
</PackageReference>
283-
<PackageReference Include="SharpYaml" Version="2.1.0">
284-
</PackageReference>
285-
<PackageReference Include="xunit" Version="2.5.1">
286-
</PackageReference>
287-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
288-
<PrivateAssets>all</PrivateAssets>
289-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
290-
</PackageReference>
266+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
267+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
268+
<PackageReference Include="SharpYaml" Version="2.1.0" />
269+
<PackageReference Include="xunit" Version="2.5.1" />
270+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
291271
</ItemGroup>
292272

293273
<ItemGroup>

‎test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0</TargetFrameworks>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="6.0.0">
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
<PrivateAssets>all</PrivateAssets>
14-
</PackageReference>
15-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
11+
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
12+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
1913
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
2014
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2115
<PackageReference Include="xunit" Version="2.5.1" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
2617
</ItemGroup>
2718

2819
<ItemGroup>

‎test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
5-
<Authors></Authors>
6-
<Company>Microsoft</Company>
7-
<Product>Microsoft.OpenApi.Tests</Product>
8-
<PackageId>Microsoft.OpenApi.Tests</PackageId>
9-
<Description>Tests for Microsoft.OpenApi</Description>
10-
<AssemblyName>Microsoft.OpenApi.Tests</AssemblyName>
11-
<RootNamespace>Microsoft.OpenApi.Tests</RootNamespace>
125
<SignAssembly>true</SignAssembly>
136
<OutputType>Library</OutputType>
147
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
158
</PropertyGroup>
169

1710
<ItemGroup>
18-
<PackageReference Include="coverlet.collector" Version="6.0.0">
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
<PrivateAssets>all</PrivateAssets>
21-
</PackageReference>
22-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
<PrivateAssets>all</PrivateAssets>
25-
</PackageReference>
11+
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
12+
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
2613
<PackageReference Include="FluentAssertions" Version="6.12.0" />
2714
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
2815
<PackageReference Include="Moq" Version="4.20.69" />
2916
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3017
<PackageReference Include="SharpYaml" Version="2.1.0" />
3118
<PackageReference Include="Verify.Xunit" Version="21.3.0" />
3219
<PackageReference Include="xunit" Version="2.5.1" />
33-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
34-
<PrivateAssets>all</PrivateAssets>
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36-
</PackageReference>
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
3721
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
3822
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
3923
</ItemGroup>

0 commit comments

Comments
 (0)