diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6c7556ad9..b54668cb1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 diff --git a/Covid19Radar.sln b/Covid19Radar.sln index b8931ab65..f16ba1549 100644 --- a/Covid19Radar.sln +++ b/Covid19Radar.sln @@ -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 diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj index cfa68f865..0533ef854 100644 --- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj +++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj @@ -12,7 +12,7 @@ Covid19Radar.Droid Covid19Radar.Android 512 - v10.0 + v11.0 True Resources\Resource.designer.cs Off @@ -132,9 +132,6 @@ 7.1.0.442 - - 12.0.3 - 7.2.0.1422 @@ -161,7 +158,7 @@ 4.6.0.967 - 19.7.1-eap.1 + 19.7.2-eap-alpha03 117.0.0-preview03 @@ -175,6 +172,9 @@ 1.2.1 + + 1.0.0-beta07 + diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj index 1b2550ba2..0923e98ad 100644 --- a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj +++ b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj @@ -368,7 +368,7 @@ 4.6.0.967 - 1.1.0-beta1 + 1.2.3-alpha01 92.0.0 @@ -376,6 +376,9 @@ 2.0.6 + + 1.0.0-beta07 + diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj index 042e930a6..90e4c864a 100644 --- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj +++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj @@ -57,7 +57,6 @@ - @@ -68,6 +67,7 @@ + diff --git a/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj b/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj index 048ef6f74..474c1e45b 100644 --- a/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj +++ b/Covid19Radar/Xamarin.ExposureNotification/Xamarin.ExposureNotification.csproj @@ -40,10 +40,8 @@ - - - - + + @@ -52,7 +50,7 @@ - + diff --git a/Nuget.config b/Nuget.config new file mode 100644 index 000000000..b1eb6ad04 --- /dev/null +++ b/Nuget.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/TempNugetFeed/Chino.Android.1.0.0-beta07.nupkg b/TempNugetFeed/Chino.Android.1.0.0-beta07.nupkg new file mode 100755 index 000000000..ddafa35e9 Binary files /dev/null and b/TempNugetFeed/Chino.Android.1.0.0-beta07.nupkg differ diff --git a/TempNugetFeed/Chino.Common.1.0.0-beta07.nupkg b/TempNugetFeed/Chino.Common.1.0.0-beta07.nupkg new file mode 100755 index 000000000..fabe4ee0f Binary files /dev/null and b/TempNugetFeed/Chino.Common.1.0.0-beta07.nupkg differ diff --git a/TempNugetFeed/Chino.iOS.1.0.0-beta07.nupkg b/TempNugetFeed/Chino.iOS.1.0.0-beta07.nupkg new file mode 100755 index 000000000..f67168fd2 Binary files /dev/null and b/TempNugetFeed/Chino.iOS.1.0.0-beta07.nupkg differ diff --git a/TempNugetFeed/README.md b/TempNugetFeed/README.md new file mode 100644 index 000000000..c99c200b8 --- /dev/null +++ b/TempNugetFeed/README.md @@ -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 \ No newline at end of file diff --git a/TempNugetFeed/Xamarin.GooglePlayServices.Nearby.ExposureNotification.19.7.2-eap-alpha03.nupkg b/TempNugetFeed/Xamarin.GooglePlayServices.Nearby.ExposureNotification.19.7.2-eap-alpha03.nupkg new file mode 100644 index 000000000..ca76618e8 Binary files /dev/null and b/TempNugetFeed/Xamarin.GooglePlayServices.Nearby.ExposureNotification.19.7.2-eap-alpha03.nupkg differ diff --git a/TempNugetFeed/Xamarin.iOS.ExposureNotification.1.2.3-alpha01.nupkg b/TempNugetFeed/Xamarin.iOS.ExposureNotification.1.2.3-alpha01.nupkg new file mode 100644 index 000000000..b121e4739 Binary files /dev/null and b/TempNugetFeed/Xamarin.iOS.ExposureNotification.1.2.3-alpha01.nupkg differ