Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

Commit

Permalink
Merge pull request #307 from keiji/setup_cappuccino
Browse files Browse the repository at this point in the history
Setup Cappuccino
  • Loading branch information
kazuhiro4949 authored Aug 7, 2021
2 parents 1c685e5 + abfa3c8 commit 1d2f453
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: msbuild ${{ github.workspace }}/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj /restore /t:Build /p:Configuration=${{ matrix.Configuration }}
test:
name: Test
runs-on: ubuntu-latest
runs-on: macos-latest # Tests must be executed on macos
needs: [build_ios, build_android]
steps:
- name: Checkout
Expand Down
3 changes: 3 additions & 0 deletions Covid19Radar.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Covid19Radar.Android", "Covid19Radar\Covid19Radar.Android\Covid19Radar.Android.csproj", "{92B1EC8F-ECF4-403A-B6F4-5EC80F43A69A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A03DD13-C0FC-4998-AFEB-74D5390C59A1}"
ProjectSection(SolutionItems) = preProject
Nuget.config = Nuget.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Covid19Radar.iOS", "Covid19Radar\Covid19Radar.iOS\Covid19Radar.iOS.csproj", "{3104A081-8DF8-4EDB-A40A-38DE78AA63AC}"
EndProject
Expand Down
10 changes: 5 additions & 5 deletions Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<RootNamespace>Covid19Radar.Droid</RootNamespace>
<AssemblyName>Covid19Radar.Android</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
Expand Down Expand Up @@ -132,9 +132,6 @@
<PackageReference Include="Acr.UserDialogs">
<Version>7.1.0.442</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Prism.Core">
<Version>7.2.0.1422</Version>
</PackageReference>
Expand All @@ -161,7 +158,7 @@
<Version>4.6.0.967</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification">
<Version>19.7.1-eap.1</Version>
<Version>19.7.2-eap-alpha03</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
<Version>117.0.0-preview03</Version>
Expand All @@ -175,6 +172,9 @@
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.2.1</Version>
</PackageReference>
<PackageReference Include="Chino.Android">
<Version>1.0.0-beta07</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
5 changes: 4 additions & 1 deletion Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,17 @@
<Version>4.6.0.967</Version>
</PackageReference>
<PackageReference Include="Xamarin.iOS.ExposureNotification">
<Version>1.1.0-beta1</Version>
<Version>1.2.3-alpha01</Version>
</PackageReference>
<PackageReference Include="Xamarin.iOS.MaterialComponents">
<Version>92.0.0</Version>
</PackageReference>
<PackageReference Include="CommonServiceLocator">
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Chino.iOS">
<Version>1.0.0-beta07</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Covid19Radar\Covid19Radar.csproj">
Expand Down
2 changes: 1 addition & 1 deletion Covid19Radar/Covid19Radar/Covid19Radar.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.442" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1422" />
<PackageReference Include="Prism.Forms" Version="7.2.0.1422" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
Expand All @@ -68,6 +67,7 @@
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.6.0.967" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.6.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.6" />
<PackageReference Include="Chino.Common" Version="1.0.0-beta07" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controls\CustomDatePicker.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@
<Compile Include="**\*.android.cs" />
<Compile Include="**\*.android.*.cs" />

<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.2.1-preview01" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.0.2-preview01" />
<PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification" Version="19.7.1-eap.1" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.2.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification" Version="19.7.2-eap-alpha03" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.2.0.1" />
<PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.5.0.1" />
</ItemGroup>

Expand All @@ -52,7 +50,7 @@
<Compile Include="*.ios.*.cs" />

<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="Xamarin.iOS.ExposureNotification" Version="1.0.0" />
<PackageReference Include="Xamarin.iOS.ExposureNotification" Version="1.2.3-alpha01" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions Nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<packageSources>
<add key="MyNuget" value="./TempNugetFeed" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
</configuration>
Binary file added TempNugetFeed/Chino.Android.1.0.0-beta07.nupkg
Binary file not shown.
Binary file added TempNugetFeed/Chino.Common.1.0.0-beta07.nupkg
Binary file not shown.
Binary file added TempNugetFeed/Chino.iOS.1.0.0-beta07.nupkg
Binary file not shown.
9 changes: 9 additions & 0 deletions TempNugetFeed/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# NuGet packages

We have created NuGet packages these added missing APIs.

* Xamarin.GooglePlayServices.Nearby.ExposureNotification
* Xamarin.iOS.ExposureNotification (Not included)

Please see more detail from below.
https://github.com/keiji/XamarinComponents/tree/exposurenotification/update_apis
Binary file not shown.
Binary file not shown.

0 comments on commit 1d2f453

Please sign in to comment.