Skip to content

Commit 47bbd5e

Browse files
robertmclawsrobertmclaws
committed
Revert "Exclude the Samples from the CI build process"
This reverts commit 7deb21f.
1 parent 7deb21f commit 47bbd5e

File tree

3 files changed

+328
-380
lines changed

3 files changed

+328
-380
lines changed

‎src/Directory.Build.props‎

Lines changed: 114 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,120 @@
11
<Project>
2-
<!-- Folder layout -->
3-
<PropertyGroup>
4-
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
5-
<IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.'))">true</IsTestProject>
6-
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.ToLower().Contains('testassets'))">true</IsTestAssetProject>
7-
<IsSampleProject Condition="$(MSBuildProjectName.ToLower().Contains('.samples.'))">true</IsSampleProject>
8-
<IsTemplateProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.'))">true</IsTemplateProject>
9-
<IsTemplatePackageProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.package'))">true</IsTemplatePackageProject>
10-
<IsNetCore Condition=" '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">true</IsNetCore>
11-
<IsPrimaryProject Condition=" '$(IsBenchmarkProject)' != 'true' And '$(IsTestProject)' != 'true' And '$(IsTestAssetProject)' != 'true' And '$(IsSampleProject)' != 'true' ">true</IsPrimaryProject>
12-
13-
<IncludeSource>false</IncludeSource>
14-
<IncludeSymbols>true</IncludeSymbols>
15-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18-
19-
<SignAssembly>true</SignAssembly>
20-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)restier.snk</AssemblyOriginatorKeyFile>
21-
<StrongNamePublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100f1fcc0061e7ed7476808f86fdecd6a9585915f329fc6312d08331c971da86230330e42ed8ffbd528c523fa023d92c3db1123b5d044b3aad9e04fd3877ffca8e4ba836a740ec3074f0fcbef770ff14d2fa1b5a8403ab16f398ac14998bd011c35505b6bc555326037a7ab7dcca118000a19a5475377358e9dea38df76452b01c9</StrongNamePublicKey>
22-
23-
<LangVersion>preview</LangVersion>
24-
<Configurations>Debug;Release;NoWebApps</Configurations>
25-
26-
</PropertyGroup>
27-
28-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
29-
<DefineConstants>TRACE;RELEASE</DefineConstants>
30-
</PropertyGroup>
31-
32-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
33-
<DefineConstants>DEBUG;TRACE</DefineConstants>
34-
</PropertyGroup>
35-
36-
<PropertyGroup>
37-
<Product>Microsoft Restier</Product>
38-
<Authors>Microsoft</Authors>
39-
<Company>Microsoft Corporation</Company>
40-
<RpmPackageVendor>.NET Foundation</RpmPackageVendor>
41-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
42-
<NeutralLanguage>en-US</NeutralLanguage>
43-
<PackageLicenseUrl>https://raw.githubusercontent.com/OData/RESTier/master/License.txt</PackageLicenseUrl>
44-
<!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
45-
<PackageLicenseType>MIT</PackageLicenseType>
46-
<!--
2+
<!-- Folder layout -->
3+
<PropertyGroup>
4+
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
5+
<IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.'))">true</IsTestProject>
6+
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.ToLower().Contains('testassets'))">true</IsTestAssetProject>
7+
<IsSampleProject Condition="$(MSBuildProjectName.ToLower().Contains('.samples.'))">true</IsSampleProject>
8+
<IsTemplateProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.'))">true</IsTemplateProject>
9+
<IsTemplatePackageProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.package'))">true</IsTemplatePackageProject>
10+
<IsNetCore Condition=" '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">true</IsNetCore>
11+
<IsPrimaryProject Condition=" '$(IsBenchmarkProject)' != 'true' And '$(IsTestProject)' != 'true' And '$(IsTestAssetProject)' != 'true' And '$(IsSampleProject)' != 'true' ">true</IsPrimaryProject>
12+
13+
<IncludeSource>false</IncludeSource>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18+
19+
<SignAssembly>true</SignAssembly>
20+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)restier.snk</AssemblyOriginatorKeyFile>
21+
<StrongNamePublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100f1fcc0061e7ed7476808f86fdecd6a9585915f329fc6312d08331c971da86230330e42ed8ffbd528c523fa023d92c3db1123b5d044b3aad9e04fd3877ffca8e4ba836a740ec3074f0fcbef770ff14d2fa1b5a8403ab16f398ac14998bd011c35505b6bc555326037a7ab7dcca118000a19a5475377358e9dea38df76452b01c9</StrongNamePublicKey>
22+
23+
<LangVersion>preview</LangVersion>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
27+
<DefineConstants>TRACE;RELEASE</DefineConstants>
28+
</PropertyGroup>
29+
30+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
31+
<DefineConstants>DEBUG;TRACE</DefineConstants>
32+
</PropertyGroup>
33+
34+
<PropertyGroup>
35+
<Product>Microsoft Restier</Product>
36+
<Authors>Microsoft</Authors>
37+
<Company>Microsoft Corporation</Company>
38+
<RpmPackageVendor>.NET Foundation</RpmPackageVendor>
39+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
40+
<NeutralLanguage>en-US</NeutralLanguage>
41+
<PackageLicenseUrl>https://raw.githubusercontent.com/OData/RESTier/master/License.txt</PackageLicenseUrl>
42+
<!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
43+
<PackageLicenseType>MIT</PackageLicenseType>
44+
<!--
4745
Suppress a warning about upcoming deprecation of PackageLicenseUrl. When embedding licenses are supported,
4846
replace PackageLicenseUrl with PackageLicenseExpression.
4947
-->
50-
<NoWarn>$(NoWarn);NU5125</NoWarn>
51-
<!-- Suppress warnings about using SemVer 2.0. -->
52-
<NoWarn>$(NoWarn);NU5105</NoWarn>
53-
54-
<!-- Contact email address for NuGet packages and Linux installers. -->
55-
<MaintainerEmail>odata@nimbleapps.cloud</MaintainerEmail>
56-
57-
<PackageIcon>dotnet-logo.png</PackageIcon>
58-
<PackageProjectUrl>https://restier.readthedocs.io/en/latest/</PackageProjectUrl>
59-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
60-
<PackageTags>odata;wcf data services;</PackageTags>
61-
<Serviceable>true</Serviceable>
62-
63-
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
64-
<RepositoryUrl>https://github.com/OData/RESTier.git</RepositoryUrl>
65-
<RepositoryType>git</RepositoryType>
66-
</PropertyGroup>
67-
68-
<!-- Compilation options -->
69-
<PropertyGroup>
70-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
71-
<ImplicitUsings>disable</ImplicitUsings>
72-
<Nullable>disable</Nullable>
73-
74-
<!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
75-
<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
76-
77-
<!-- Fixes a common error in targets implementing a NoBuild mode. -->
78-
<BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
79-
80-
<!-- Suppress warnings about uninstantiated classes. -->
81-
<NoWarn>$(NoWarn);CA1812;CS1570</NoWarn>
82-
</PropertyGroup>
83-
84-
<PropertyGroup Condition=" $(IsTestProject) == 'true' ">
85-
<NoWarn>$(NoWarn);CA1001;CA1031;CA1062;CA1301;CA1303;AC1307;CA1707;CA1716;CA1801;CA1806;CA1819;CA1822;CA1825;CA2000;CA2007;CA2227;CA2234</NoWarn>
86-
</PropertyGroup>
87-
88-
<PropertyGroup Condition=" $(IsSampleProject) == 'true' ">
89-
<NoWarn>$(NoWarn);CA1001;CA1707;CA1716;CA1801;CA1822</NoWarn>
90-
</PropertyGroup>
91-
92-
<PropertyGroup Condition=" '$(IsPrimaryProject)' == 'true' ">
93-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
94-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
95-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)</DocumentationFile>
96-
</PropertyGroup>
97-
98-
<PropertyGroup>
99-
<StandardTestTfms>netcoreapp3.1;net472</StandardTestTfms>
100-
</PropertyGroup>
101-
102-
<ItemGroup Condition=" $(IsTestProject) != 'true' and $(IsSampleProject) != 'true'">
103-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
104-
105-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
106-
<_Parameter1>$(AssemblyName.Replace("Microsoft.Restier.", "Microsoft.Restier.Tests.")), $(StrongNamePublicKey)</_Parameter1>
107-
</AssemblyAttribute>
108-
</ItemGroup>
109-
110-
<ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsSampleProject) != 'true'">
111-
<PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
112-
<PackageReference Include="FluentAssertions.Analyzers" Version="0.*" PrivateAssets="All" />
113-
<PackageReference Include="MSTest.TestAdapter" Version="2.*" />
114-
<PackageReference Include="MSTest.TestFramework" Version="2.*" />
115-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
116-
</ItemGroup>
117-
118-
<ItemGroup>
119-
<None Include="$(MSBuildThisFileDirectory)dotnet-logo.png" Pack="true" PackagePath="\" Condition="'$(IsTestProject)' != 'true'" />
120-
</ItemGroup>
48+
<NoWarn>$(NoWarn);NU5125</NoWarn>
49+
<!-- Suppress warnings about using SemVer 2.0. -->
50+
<NoWarn>$(NoWarn);NU5105</NoWarn>
51+
52+
<!-- Contact email address for NuGet packages and Linux installers. -->
53+
<MaintainerEmail>odata@nimbleapps.cloud</MaintainerEmail>
54+
55+
<PackageIcon>dotnet-logo.png</PackageIcon>
56+
<PackageProjectUrl>https://restier.readthedocs.io/en/latest/</PackageProjectUrl>
57+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
58+
<PackageTags>odata;wcf data services;</PackageTags>
59+
<Serviceable>true</Serviceable>
60+
61+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
62+
<RepositoryUrl>https://github.com/OData/RESTier.git</RepositoryUrl>
63+
<RepositoryType>git</RepositoryType>
64+
</PropertyGroup>
65+
66+
<!-- Compilation options -->
67+
<PropertyGroup>
68+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
69+
<ImplicitUsings>disable</ImplicitUsings>
70+
<Nullable>disable</Nullable>
71+
72+
<!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
73+
<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
74+
75+
<!-- Fixes a common error in targets implementing a NoBuild mode. -->
76+
<BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
77+
78+
<!-- Suppress warnings about uninstantiated classes. -->
79+
<NoWarn>$(NoWarn);CA1812;CS1570</NoWarn>
80+
</PropertyGroup>
81+
82+
<PropertyGroup Condition=" $(IsTestProject) == 'true' ">
83+
<NoWarn>$(NoWarn);CA1001;CA1031;CA1062;CA1301;CA1303;AC1307;CA1707;CA1716;CA1801;CA1806;CA1819;CA1822;CA1825;CA2000;CA2007;CA2227;CA2234</NoWarn>
84+
</PropertyGroup>
85+
86+
<PropertyGroup Condition=" $(IsSampleProject) == 'true' ">
87+
<NoWarn>$(NoWarn);CA1001;CA1707;CA1716;CA1801;CA1822</NoWarn>
88+
</PropertyGroup>
89+
90+
<PropertyGroup Condition=" '$(IsPrimaryProject)' == 'true' ">
91+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
92+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
93+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)</DocumentationFile>
94+
</PropertyGroup>
95+
96+
<PropertyGroup>
97+
<StandardTestTfms>netcoreapp3.1;net472</StandardTestTfms>
98+
</PropertyGroup>
99+
100+
<ItemGroup Condition=" $(IsTestProject) != 'true' and $(IsSampleProject) != 'true'">
101+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
102+
103+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
104+
<_Parameter1>$(AssemblyName.Replace("Microsoft.Restier.", "Microsoft.Restier.Tests.")), $(StrongNamePublicKey)</_Parameter1>
105+
</AssemblyAttribute>
106+
</ItemGroup>
107+
108+
<ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsSampleProject) != 'true'">
109+
<PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
110+
<PackageReference Include="FluentAssertions.Analyzers" Version="0.17.*" PrivateAssets="All" />
111+
<PackageReference Include="MSTest.TestAdapter" Version="2.*" />
112+
<PackageReference Include="MSTest.TestFramework" Version="2.*" />
113+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
114+
</ItemGroup>
115+
116+
<ItemGroup>
117+
<None Include="$(MSBuildThisFileDirectory)dotnet-logo.png" Pack="true" PackagePath="\" Condition="'$(IsTestProject)' != 'true'" />
118+
</ItemGroup>
121119

122120
</Project>

0 commit comments

Comments
 (0)