Skip to content

Commit

Permalink
Fix Integration build (#3347)
Browse files Browse the repository at this point in the history 
* Fix Integration

Issue remains in Android app - unable to find resource

* Rollback Xamarin.Android.Support.Design to 27.*
  • Loading branch information
@ChrisPulman
ChrisPulman committed Aug 22, 2022
1 parent 55306bf commit db9b528
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.*" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj">
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Android/MainActivity.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Mac/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Mac/LoginViewController.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Mac/MainClass.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Mac/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Shared.Tests/BuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Shared.Tests/Features/Login/LoginViewModelBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Shared.Tests/Features/Login/LoginViewModelTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Shared.Tests/IBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.Shared/LoginViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WPF/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WPF/LoginControl.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WPF/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WPF/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WPF/UserControlExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WinForms/LoginControl.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WinForms/MainForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WinForms/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.WinForms/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms.Android/MainActivity.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms.Android/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms.UWP/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms.UWP/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms.UWP/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.XamarinForms/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.iOS/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.iOS/Application.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/IntegrationTests.iOS/LoginViewController.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.
Expand Down

0 comments on commit db9b528

Please sign in to comment.