Skip to content

Commit 8c8007d

Browse files
glennawatsonChrisPulman
glennawatson
and
ChrisPulman
authored
housekeeping: Use the common build script (#3039)
* housekeeping: Use the common build script * Update build-samples.yml * Add AppCompat package * Updated integration tests * Update RoutingStateTests.cs * remove the sample build until needed Co-authored-by: Chris Pulman <[email protected]>
1 parent 840ea48 commit 8c8007d

File tree

10 files changed

+150
-192
lines changed

10 files changed

+150
-192
lines changed

‎.github/workflows/build-samples.yml

Lines changed: 17 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,22 @@
11
name: Sample Build
22

33
on:
4-
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
8-
9-
jobs:
10-
build-samples:
11-
runs-on: windows-2022
12-
steps:
13-
14-
- name: Update VS2022 preview
15-
shell: bash
16-
run: |
17-
dotnet tool update -g dotnet-vs
18-
vs modify preview +mobile +xamarin +core +desktop +uwp +web
19-
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
20-
21-
- name: Install Windows SDK 10.0.16299
22-
shell: pwsh
23-
run: |
24-
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
25-
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
26-
$startInfo.FileName = "winsdk.exe"
27-
$startInfo.Arguments = "/norestart /quiet"
28-
$process = New-Object System.Diagnostics.Process
29-
$process.StartInfo = $startInfo
30-
$process.Start()
31-
$process.WaitForExit()
32-
33-
- name: Checkout
34-
uses: actions/checkout@v2
35-
with:
36-
fetch-depth: 0
37-
lfs: true
38-
39-
- name: Install .NET Core
40-
uses: actions/[email protected]
41-
with:
42-
dotnet-version: 3.1.x
43-
44-
- name: Install .NET 5
45-
uses: actions/[email protected]
46-
with:
47-
dotnet-version: 5.0.x
48-
49-
- name: Install .NET 6
50-
uses: actions/[email protected]
51-
with:
52-
dotnet-version: 6.0.x
53-
include-prerelease: true
54-
55-
- name: Install DotNet workloads
56-
shell: bash
57-
run: |
58-
dotnet workload install android
59-
dotnet workload install ios
60-
dotnet workload install tvos
61-
dotnet workload install macos
62-
dotnet workload install maui
63-
dotnet tool install -g Redth.Net.Maui.Check
64-
maui-check --non-interactive --fix
4+
workflow_dispatch:
5+
inputs:
6+
disable:
7+
description: "temporarily disabled"
658

66-
- name: Add MSBuild to PATH
67-
uses: glennawatson/[email protected]
68-
with:
69-
prerelease: true
9+
env:
10+
productNamespacePrefix: "ReactiveUI"
7011

71-
- name: Restore/Build the sample
72-
run: msbuild IntegrationTests.All.sln /t:restore,build /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=Release
73-
working-directory: integrationtests
12+
jobs:
13+
build:
14+
uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main
15+
with:
16+
configuration: Release
17+
productNamespacePrefix: "ReactiveUI"
18+
useVisualStudioPreview: false
19+
useMauiCheckDotNetTool: false
20+
srcFolder: 'integrationtests'
21+
solutionFile: 'IntegrationTests.All.sln'
22+
performTests: false

‎.github/workflows/ci-build.yml

Lines changed: 7 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -7,119 +7,14 @@ on:
77
branches: [ main ]
88

99
env:
10-
configuration: Release
1110
productNamespacePrefix: "ReactiveUI"
1211

1312
jobs:
1413
build:
15-
runs-on: windows-2022
16-
outputs:
17-
nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
18-
steps:
19-
20-
- name: Update VS2022 preview
21-
shell: bash
22-
run: |
23-
dotnet tool update -g dotnet-vs
24-
vs modify preview +mobile +xamarin +core +desktop +uwp +web
25-
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
26-
27-
- name: Install Windows SDK 10.0.16299
28-
shell: pwsh
29-
run: |
30-
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
31-
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
32-
$startInfo.FileName = "winsdk.exe"
33-
$startInfo.Arguments = "/norestart /quiet"
34-
$process = New-Object System.Diagnostics.Process
35-
$process.StartInfo = $startInfo
36-
$process.Start()
37-
$process.WaitForExit()
38-
39-
- name: Checkout
40-
uses: actions/checkout@v2
41-
with:
42-
fetch-depth: 0
43-
lfs: true
44-
45-
- name: Install .NET Core
46-
uses: actions/[email protected]
47-
with:
48-
dotnet-version: 3.1.x
49-
50-
- name: Install .NET 5
51-
uses: actions/[email protected]
52-
with:
53-
dotnet-version: 5.0.x
54-
55-
- name: Install .NET 6
56-
uses: actions/[email protected]
57-
with:
58-
dotnet-version: 6.0.x
59-
include-prerelease: true
60-
61-
- name: Install DotNet workloads
62-
shell: bash
63-
run: |
64-
dotnet workload install android
65-
dotnet workload install ios
66-
dotnet workload install tvos
67-
dotnet workload install macos
68-
dotnet workload install maui
69-
dotnet workload restore "src/ReactiveUI/ReactiveUI.csproj"
70-
dotnet tool install -g Redth.Net.Maui.Check
71-
maui-check --non-interactive --fix
72-
73-
- name: Add MSBuild to PATH
74-
uses: glennawatson/[email protected]
75-
with:
76-
prerelease: true
77-
78-
- name: NBGV
79-
id: nbgv
80-
uses: dotnet/nbgv@master
81-
with:
82-
setAllVars: true
83-
84-
- name: NuGet restore
85-
run: |
86-
dotnet restore ReactiveUI.sln
87-
working-directory: src
88-
89-
# Removed until Pharmacist can be released with new package
90-
#- name: Install Pharmacist and Generate Events
91-
# run: |
92-
# dotnet tool install -g Pharmacist
93-
# pharmacist generate-platform -t uap10.0.16299,uap10.0.17134,uap10.0.17763,uap10.0.18362,uap10.0.19041,xamarin.mac20,xamarin.tvos10,monoandroid10.0,monoandroid11.0,xamarin.ios10,xamarin.watchos10 -o "src/ReactiveUI.Events/" --output-prefix "Events_"
94-
# pharmacist generate-platform -t net461,net462,net47,net471,net472,net48,netcoreapp3.1,net5.0 --is-wpf -o "src/ReactiveUI.Events.WPF/" --output-prefix "Events_"
95-
# pharmacist generate-platform -t net461,net462,net47,net471,net472,net48,netcoreapp3.1,net5.0 --is-winforms -o "src/ReactiveUI.Events.Winforms/" --output-prefix "Events_"
96-
97-
- name: Build
98-
run: |
99-
msbuild /t:build,pack /nowarn:MSB4011,VSX1000 /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} ReactiveUI.sln
100-
working-directory: src
101-
102-
- name: Run Unit Tests and Generate Coverage
103-
uses: glennawatson/coverlet-msbuild@v1
104-
with:
105-
project-files: 'src/**/*Tests*.csproj'
106-
no-build: true
107-
exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
108-
include-filter: '[${{env.productNamespacePrefix}}*]*'
109-
output-format: cobertura
110-
output: '../../artifacts/'
111-
configuration: ${{ env.configuration }}
112-
113-
- name: Upload Code Coverage
114-
shell: bash
115-
run: |
116-
echo $PWD
117-
bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -t ${{ env.CODECOV_TOKEN }} -s '$PWD/artifacts' -f '*.xml'
118-
env:
119-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
120-
121-
- name: Create NuGet Artifacts
122-
uses: actions/upload-artifact@master
123-
with:
124-
name: nuget
125-
path: '**/*.nupkg'
14+
uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main
15+
with:
16+
configuration: Release
17+
productNamespacePrefix: "ReactiveUI"
18+
useVisualStudioPreview: false
19+
useMauiCheckDotNetTool: false
20+
solutionFile: "reactiveui.sln"

‎integrationtests/Directory.Build.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<Platform>AnyCPU</Platform>
1414
<SourceLinkEnabled></SourceLinkEnabled>
1515
<GenerateDocumentationFile>true</GenerateDocumentationFile>
16-
<IsPackable>false</IsPackable>
16+
<IsPackable>false</IsPackable>
17+
<AnalysisLevel>latest</AnalysisLevel>
18+
<EnableNETAnalyzers>True</EnableNETAnalyzers>
1719
</PropertyGroup>
1820

1921
<ItemGroup>
@@ -25,8 +27,7 @@
2527
</PropertyGroup>
2628
<ItemGroup>
2729
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
28-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
29-
<PackageReference Include="Roslynator.Analyzers" Version="3.2.2" PrivateAssets="All" />
30+
<PackageReference Include="Roslynator.Analyzers" Version="3.3.0" PrivateAssets="All" />
3031
</ItemGroup>
3132
<ItemGroup>
3233
<AdditionalFiles Include="$(MSBuildThisFileDirectory)..\src\stylecop.json" Link="stylecop.json" />

‎integrationtests/IntegrationTests.All.sln

Lines changed: 104 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30804.86
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31912.275
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Android", "IntegrationTests.Android\IntegrationTests.Android.csproj", "{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}"
77
EndProject
@@ -48,6 +48,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.XamForms", "..\s
4848
EndProject
4949
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.AndroidSupport", "..\src\ReactiveUI.AndroidSupport\ReactiveUI.AndroidSupport.csproj", "{E6284535-0B6E-42AA-9113-5230AB09E8E6}"
5050
EndProject
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Uwp", "..\src\ReactiveUI.Uwp\ReactiveUI.Uwp.csproj", "{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}"
52+
EndProject
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.AndroidX", "..\src\ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj", "{824088E4-A1D2-4B71-843E-873D351073C8}"
54+
EndProject
5155
Global
5256
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5357
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -988,6 +992,102 @@ Global
988992
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x64.Build.0 = Release|Any CPU
989993
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x86.ActiveCfg = Release|Any CPU
990994
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x86.Build.0 = Release|Any CPU
995+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
996+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
997+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
998+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
999+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
1000+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
1001+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1002+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
1003+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
1004+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
1005+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
1006+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
1007+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
1008+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|Any CPU.Build.0 = Debug|Any CPU
1009+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|ARM.ActiveCfg = Debug|Any CPU
1010+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|ARM.Build.0 = Debug|Any CPU
1011+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
1012+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|iPhone.Build.0 = Debug|Any CPU
1013+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1014+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
1015+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|x64.ActiveCfg = Debug|Any CPU
1016+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|x64.Build.0 = Debug|Any CPU
1017+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|x86.ActiveCfg = Debug|Any CPU
1018+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.AppStore|x86.Build.0 = Debug|Any CPU
1019+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1020+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|Any CPU.Build.0 = Debug|Any CPU
1021+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|ARM.ActiveCfg = Debug|Any CPU
1022+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|ARM.Build.0 = Debug|Any CPU
1023+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|iPhone.ActiveCfg = Debug|Any CPU
1024+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|iPhone.Build.0 = Debug|Any CPU
1025+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1026+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
1027+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|x64.ActiveCfg = Debug|Any CPU
1028+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|x64.Build.0 = Debug|Any CPU
1029+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|x86.ActiveCfg = Debug|Any CPU
1030+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Debug|x86.Build.0 = Debug|Any CPU
1031+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|Any CPU.ActiveCfg = Release|Any CPU
1032+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|Any CPU.Build.0 = Release|Any CPU
1033+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|ARM.ActiveCfg = Release|Any CPU
1034+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|ARM.Build.0 = Release|Any CPU
1035+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|iPhone.ActiveCfg = Release|Any CPU
1036+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|iPhone.Build.0 = Release|Any CPU
1037+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
1038+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
1039+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|x64.ActiveCfg = Release|Any CPU
1040+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|x64.Build.0 = Release|Any CPU
1041+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|x86.ActiveCfg = Release|Any CPU
1042+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17}.Release|x86.Build.0 = Release|Any CPU
1043+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
1044+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
1045+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
1046+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
1047+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
1048+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
1049+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1050+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
1051+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
1052+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
1053+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
1054+
{824088E4-A1D2-4B71-843E-873D351073C8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
1055+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
1056+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
1057+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|ARM.ActiveCfg = Debug|Any CPU
1058+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|ARM.Build.0 = Debug|Any CPU
1059+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
1060+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|iPhone.Build.0 = Debug|Any CPU
1061+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1062+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
1063+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|x64.ActiveCfg = Debug|Any CPU
1064+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|x64.Build.0 = Debug|Any CPU
1065+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|x86.ActiveCfg = Debug|Any CPU
1066+
{824088E4-A1D2-4B71-843E-873D351073C8}.AppStore|x86.Build.0 = Debug|Any CPU
1067+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1068+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
1069+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|ARM.ActiveCfg = Debug|Any CPU
1070+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|ARM.Build.0 = Debug|Any CPU
1071+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
1072+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|iPhone.Build.0 = Debug|Any CPU
1073+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1074+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
1075+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|x64.ActiveCfg = Debug|Any CPU
1076+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|x64.Build.0 = Debug|Any CPU
1077+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|x86.ActiveCfg = Debug|Any CPU
1078+
{824088E4-A1D2-4B71-843E-873D351073C8}.Debug|x86.Build.0 = Debug|Any CPU
1079+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
1080+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|Any CPU.Build.0 = Release|Any CPU
1081+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|ARM.ActiveCfg = Release|Any CPU
1082+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|ARM.Build.0 = Release|Any CPU
1083+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|iPhone.ActiveCfg = Release|Any CPU
1084+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|iPhone.Build.0 = Release|Any CPU
1085+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
1086+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
1087+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|x64.ActiveCfg = Release|Any CPU
1088+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|x64.Build.0 = Release|Any CPU
1089+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|x86.ActiveCfg = Release|Any CPU
1090+
{824088E4-A1D2-4B71-843E-873D351073C8}.Release|x86.Build.0 = Release|Any CPU
9911091
EndGlobalSection
9921092
GlobalSection(SolutionProperties) = preSolution
9931093
HideSolutionNode = FALSE
@@ -999,6 +1099,8 @@ Global
9991099
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
10001100
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
10011101
{E6284535-0B6E-42AA-9113-5230AB09E8E6} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
1102+
{7B5A4E3B-8706-4D5B-B979-C5E39289CE17} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
1103+
{824088E4-A1D2-4B71-843E-873D351073C8} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
10021104
EndGlobalSection
10031105
GlobalSection(ExtensibilityGlobals) = postSolution
10041106
SolutionGuid = {EDE6B0FD-3EF7-49C4-AF1D-E7485C1FEFAF}

‎integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@
102102
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.*" />
103103
</ItemGroup>
104104
<ItemGroup>
105+
<ProjectReference Include="..\..\src\ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj">
106+
<Project>{824088e4-a1d2-4b71-843e-873d351073c8}</Project>
107+
<Name>ReactiveUI.AndroidX</Name>
108+
</ProjectReference>
105109
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj">
106110
<Project>{f9808728-e148-438b-96ea-5f18c832cf4a}</Project>
107111
<Name>ReactiveUI</Name>
@@ -112,4 +116,4 @@
112116
</ProjectReference>
113117
</ItemGroup>
114118
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
115-
</Project>
119+
</Project>

‎integrationtests/IntegrationTests.Android/Resources/layout/content_main.axml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
android:layout_below="@id/Password"
3232
android:layout_toRightOf="@id/Login"
3333
android:text="Cancel" />
34-
</RelativeLayout>
34+
</RelativeLayout>

0 commit comments

Comments
 (0)