Skip to content

Commit 3da790b

Browse files
ChrisPulmanChrisPulman
authored
Fix for API tests, Simplify Targets (#1066)
1 parent fabbac5 commit 3da790b

File tree

35 files changed

+144
-2624
lines changed

35 files changed

+144
-2624
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,3 +408,6 @@ src/Tools/
408408
**/Droid/**/[Rr]esource.[Dd]esigner.cs
409409
**/*.Android.*/**/[Rr]esource.[Dd]esigner.cs
410410
**/*.Droid.*/**/[Rr]esource.[Dd]esigner.cs
411+
412+
# API Approval
413+
src/*.Tests/API/*.received.txt

‎src/Directory.build.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
2727
<ImplicitUsings>true</ImplicitUsings>
2828
<LangVersion>preview</LangVersion>
29+
<Nullable>enable</Nullable>
2930
<NoWarn>$(NoWarn);VSSpell001;SA1010</NoWarn>
3031

3132
<!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
@@ -37,6 +38,8 @@
3738
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3839
<!-- Include PDB in the built .nupkg -->
3940
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
41+
<SplatTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</SplatTargetFrameworks>
42+
<SplatWindowsTargetFrameworks>net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</SplatWindowsTargetFrameworks>
4043
</PropertyGroup>
4144
<PropertyGroup Condition="$(IsTestProject) != 'true'">
4245
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -53,7 +56,7 @@
5356

5457
<ItemGroup Condition="$(IsTestProject) or $(MSBuildProjectName.Contains('TestRunner'))">
5558
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
56-
<PackageReference Include="xunit" Version="2.6.1" />
59+
<PackageReference Include="xunit" Version="2.6.2" />
5760
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
5861
<PackageReference Include="FluentAssertions" Version="6.12.0" />
5962
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
@@ -62,8 +65,8 @@
6265
</ItemGroup>
6366

6467
<ItemGroup Condition="$(IsTestProject)">
65-
<PackageReference Include="xunit.runner.console" Version="2.6.1" />
66-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
68+
<PackageReference Include="xunit.runner.console" Version="2.6.2" />
69+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
6770
<PackageReference Include="coverlet.msbuild" Version="6.0.0" />
6871
</ItemGroup>
6972

‎src/Directory.build.targets‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@
77
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
88
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
99
</PropertyGroup>
10-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
11-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
10+
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
11+
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
1212
</PropertyGroup>
13-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) or $(TargetFramework.StartsWith('net7.0-ios')) or $(TargetFramework.StartsWith('net8.0-ios'))">
13+
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
1414
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
1515
</PropertyGroup>
1616
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
1717
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
1818
</PropertyGroup>
19-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos')) or $(TargetFramework.StartsWith('net7.0-macos')) or $(TargetFramework.StartsWith('net8.0-macos'))">
20-
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
21-
</PropertyGroup>
2219
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
2320
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
2421
</PropertyGroup>
25-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos')) or $(TargetFramework.StartsWith('net7.0-tvos')) or $(TargetFramework.StartsWith('net8.0-tvos'))">
26-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
27-
</PropertyGroup>
28-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-maccatalyst')) or $(TargetFramework.StartsWith('net7.0-maccatalyst')) or $(TargetFramework.StartsWith('net8.0-maccatalyst'))">
29-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;MACCATALYST</DefineConstants>
30-
</PropertyGroup>
3122
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
3223
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
3324
</PropertyGroup>
34-
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
35-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android')) or $(TargetFramework.StartsWith('net7.0-android')) or $(TargetFramework.StartsWith('net8.0-android'))">
38-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
39-
</PropertyGroup>
4025
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
4126
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
4227
</PropertyGroup>
28+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-ios'))">
29+
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-macos'))">
32+
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-tvos'))">
35+
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-maccatalyst'))">
38+
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;MACCATALYST</DefineConstants>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-android'))">
41+
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
42+
</PropertyGroup>
4343
<PropertyGroup Condition="$(TargetFramework.Equals('net6.0')) or $(TargetFramework.Equals('net7.0')) or $(TargetFramework.Equals('net8.0')) or $(TargetFramework.Equals('netstandard2.1')) or $(TargetFramework.Equals('netstandard2.0'))">
4444
<DefineConstants>$(DefineConstants);IS_SHARED_NET</DefineConstants>
4545
</PropertyGroup>

‎src/Splat.AppCenter/Splat.AppCenter.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
5-
<!--need to consider? monoandroid50;xamarin.ios10,uap10.0 -->
4+
<TargetFrameworks>netstandard2.0;$(SplatWindowsTargetFrameworks)</TargetFrameworks>
5+
<!--need to consider? monoandroid50;xamarin.ios10 -->
66
<AssemblyName>Splat.AppCenter</AssemblyName>
77
<RootNamespace>Splat</RootNamespace>
88
<Authors>.NET Foundation and Contributors</Authors>
99
<Description>Visual Studio AppCenter integrations for Splat</Description>
1010
<PackageId>Splat.AppCenter</PackageId>
11-
<Nullable>enable</Nullable>
1211
</PropertyGroup>
1312

1413
<ItemGroup>

‎src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
55
<AssemblyName>Splat.ApplicationInsights</AssemblyName>
66
<RootNamespace>Splat</RootNamespace>
77
<Authors>.NET Foundation and Contributors</Authors>
88
<Description>ApplicationInsights integrations for Splat</Description>
99
<PackageId>Splat.ApplicationInsights</PackageId>
10-
<Nullable>enable</Nullable>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />

‎src/Splat.Autofac/Splat.Autofac.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
55
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
66
<Description>Autofac adapter for Splat</Description>
7-
<Nullable>enable</Nullable>
87
</PropertyGroup>
98

109
<ItemGroup>

0 commit comments

Comments
 (0)