Skip to content

Commit

Permalink
Update to correct ExcludeMicrosoftNetTestSdk (dotnet#22459)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmarinho
rmarinho authored May 16, 2024
1 parent 8183a9c commit 86c60b3
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/TestCases/Controls.TestCases.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>Microsoft.Maui.DeviceTests.Shared</AssemblyName>
<!--<Nullable>enable</Nullable>-->
<NoWarn>$(NoWarn),CA1416</NoWarn>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/Core/tests/DeviceTests/Core.DeviceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TestUtils/src/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!--<Nullable>enable</Nullable>-->
<NoWarn>$(NoWarn);CA1416</NoWarn>
<WarningsNotAsErrors>$(WarningsNotAsErrors);XC0022;XC0023</WarningsNotAsErrors>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TestUtils/src/DeviceTests/TestUtils.DeviceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<RootNamespace>Microsoft.Maui.TestUtils.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.TestUtils.DeviceTests</AssemblyName>
<Nullable>enable</Nullable>
<ExcludeMicrosoftNetTestSdk>false</ExcludeMicrosoftNetTestSdk>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/TestUtils/src/TestUtils/TestUtils.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<ExcludeMicrosoftNetTestSdk>true</ExcludeMicrosoftNetTestSdk>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 86c60b3

Please sign in to comment.