Skip to content

Commit d3cc8d3

Browse files
authored
fix add per platform sln's to try and get build working (#367)
* Create per platform sln's to try and get build working organise project locations and tidy up some floating files * Update dotnet-desktop.yml * Update dotnet-desktop.yml * Update dotnet-desktop.yml removed macos from matrix * Update dotnet-desktop.yml * Update dotnet-desktop.yml * Update dotnet-desktop.yml try to add xamarin sdk to ios and android * Update dotnet-desktop.yml * Update dotnet-desktop.yml Windows only until a fix can be found for xamarin builds * Update some of the old Samples, update readme to reflect current content housekeeping clean-up unused files * updated FSharp wpf package * Update dotnet-desktop.yml * Update dotnet-desktop.yml * Update dotnet-desktop.yml * further attempt to get to build * Updates to packages * Update packages, fix some warning issues * Update dotnet-desktop.yml * Update dotnet-desktop.yml
1 parent 4319083 commit d3cc8d3

File tree

487 files changed

+9713
-28750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+9713
-28750
lines changed

.github/workflows/dotnet-desktop.yml

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,11 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: [macos-latest, windows-latest]
19+
os: [windows-latest]
2020
include:
21-
- os: macos-latest
22-
buildtype: "iphone"
23-
- name: Set default Xamarin SDK versions
24-
run: |
25-
$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --ios=14.10
26-
- name: Set default Xcode 12.3
27-
run: |
28-
XCODE_ROOT=/Applications/Xcode_12.3.0.app
29-
echo "MD_APPLE_SDK_ROOT=$XCODE_ROOT" >> $GITHUB_ENV
30-
sudo xcode-select -s $XCODE_ROOT
31-
32-
- os: macos-latest
33-
buildtype: "android"
34-
- name: Set default Xamarin SDK versions
35-
run: |
36-
$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.10 --android=10.2
37-
3821
- os: windows-latest
3922
buildtype: "windows"
40-
- name: Install .NET Core
41-
uses: actions/[email protected]
42-
with:
43-
dotnet-version: 3.1.x
23+
4424
runs-on: ${{ matrix.os }}
4525
steps:
4626
- name: Echo build details
@@ -52,31 +32,52 @@ jobs:
5232
uses: actions/checkout@v2
5333

5434
# Install the .NET Core workload
55-
- name: Install .NET Core
56-
uses: actions/setup-dotnet@v1.7.2
35+
- name: Install .NET Core 5.0
36+
uses: actions/setup-dotnet@v1.8.1
5737
with:
5838
dotnet-version: 5.0.x
59-
60-
- name: NuGet Restore
61-
run: dotnet restore
62-
63-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
39+
40+
- name: Install .NET Core 3.1
41+
uses: actions/[email protected]
42+
with:
43+
dotnet-version: 3.1.x
44+
45+
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
6446
- name: Setup MSBuild.exe
6547
uses: microsoft/[email protected]
48+
49+
#- name: NuGet Restore android
50+
# run: dotnet restore ReactiveUI.Samples.Android.sln
6651

67-
- name: build iphone
68-
if: "contains(matrix.buildtype, 'iphone')"
69-
run: msbuild <csproj_file_path> /p:Configuration=${{ env.configuration }} /p:Platform=iPhoneSimulator /t:Rebuild
70-
71-
- name: build android
72-
if: "contains(matrix.buildtype, 'android')"
73-
run: msbuild <csproj_file_path> /t:PackageForAndroid /p:Configuration=${{ env.configuration }}
52+
#- name: build android
53+
# run: msbuild ReactiveUI.Samples.Android.sln /p:Configuration=${{ env.configuration }}
7454

55+
#- name: Execute unit tests android
56+
# run: dotnet test ReactiveUI.Samples.Android.sln --verbosity normal
57+
58+
- name: NuGet Restore windows
59+
run: dotnet restore ReactiveUI.Samples.Windows.sln
60+
7561
- name: build windows
76-
if: "contains(matrix.buildtype, 'windows')"
77-
run: dotnet build --configuration ${{ env.configuration }} --no-restore
62+
run: msbuild ReactiveUI.Samples.Windows.sln /p:configuration=${{ env.configuration }}
7863

64+
- name: Execute unit tests windows
65+
run: dotnet test ReactiveUI.Samples.Windows.sln --verbosity normal
66+
67+
# Restore each platform
68+
#- name: NuGet Restore iphone
69+
# if: "contains(matrix.buildtype, 'iphone')"
70+
# run: dotnet restore ReactiveUI.Samples.ios.sln
71+
72+
# Build each platform
73+
#- name: build iphone
74+
# if: "contains(matrix.buildtype, 'iphone')"
75+
# run: msbuild ReactiveUI.Samples.ios.sln /p:Configuration=${{ env.configuration }}
76+
7977
# Execute all unit tests in the solution
80-
- name: Execute unit tests
81-
run: dotnet test --no-restore --verbosity normal
78+
#- name: Execute unit tests iphone
79+
# if: "contains(matrix.buildtype, 'iphone')"
80+
# run: dotnet test ReactiveUI.Samples.ios.sln --verbosity normal
81+
82+
8283

Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<!--<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.333" PrivateAssets="all" />-->
1616
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
17-
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0" PrivateAssets="All" />
17+
<PackageReference Include="Roslynator.Analyzers" Version="3.2.2" PrivateAssets="All" />
1818
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
1919
</ItemGroup>
2020
</Project>

OldSamples/ReactiveTwitter/App.Droid/Resources/Resource.designer.cs

Lines changed: 9 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OldSamples/ReactiveTwitter/Services.Droid/Resources/Resource.designer.cs

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)