Skip to content
This repository was archived by the owner on Feb 19, 2021. It is now read-only.

Commit b03037f

Browse files
kazumihirosekazumihirose
authored
Merge pull request #711 from Covid-19Radar/master
RC7
2 parents 9c30f16 + df58dd6 commit b03037f

21 files changed

Lines changed: 1442 additions & 284 deletions

‎Covid19Radar.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{460BECFC
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Covid19Radar.UITest", "Covid19Radar\Tests\Covid19Radar.UITest\Covid19Radar.UITest.csproj", "{4223EE63-A661-4465-BBB0-08DD80DB2256}"
1717
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ExposureNotification", "Covid19Radar\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj", "{58E47288-FE26-4402-97A1-EDE546F1D849}"
19+
EndProject
1820
Global
1921
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2022
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -165,6 +167,36 @@ Global
165167
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhone.Build.0 = Release|Any CPU
166168
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
167169
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
170+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
171+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
172+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
173+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
174+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
175+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
176+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
177+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|Any CPU.Build.0 = Debug|Any CPU
178+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
179+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhone.Build.0 = Debug|Any CPU
180+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
181+
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
182+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|Any CPU.ActiveCfg = Debug|Any CPU
183+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|Any CPU.Build.0 = Debug|Any CPU
184+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhone.ActiveCfg = Debug|Any CPU
185+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhone.Build.0 = Debug|Any CPU
186+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhoneSimulator.ActiveCfg = Debug|Any CPU
187+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhoneSimulator.Build.0 = Debug|Any CPU
188+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
189+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|Any CPU.Build.0 = Debug|Any CPU
190+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhone.ActiveCfg = Debug|Any CPU
191+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhone.Build.0 = Debug|Any CPU
192+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
193+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
194+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|Any CPU.ActiveCfg = Release|Any CPU
195+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|Any CPU.Build.0 = Release|Any CPU
196+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhone.ActiveCfg = Release|Any CPU
197+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhone.Build.0 = Release|Any CPU
198+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
199+
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
168200
EndGlobalSection
169201
GlobalSection(SolutionProperties) = preSolution
170202
HideSolutionNode = FALSE

‎Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@
247247
<Project>{554EE1AB-B447-480C-90E5-C4F040891DE6}</Project>
248248
<Name>Covid19Radar</Name>
249249
</ProjectReference>
250+
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj">
251+
<Project>{58e47288-fe26-4402-97a1-ede546f1d849}</Project>
252+
<Name>Xamarin.ExposureNotification</Name>
253+
</ProjectReference>
250254
</ItemGroup>
251255
<ItemGroup>
252256
<AndroidResource Include="Resources\values\colors.xml" />

‎Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
<CrashReportingDelay>-1</CrashReportingDelay>
8080
<MtouchLink>SdkOnly</MtouchLink>
8181
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
82-
<MtouchInterpreter>-all</MtouchInterpreter>
82+
<MtouchInterpreter>
83+
</MtouchInterpreter>
8384
</PropertyGroup>
8485
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
8586
<DefineConstants>DEBUG;__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
@@ -511,6 +512,10 @@
511512
<Project>{554EE1AB-B447-480C-90E5-C4F040891DE6}</Project>
512513
<Name>Covid19Radar</Name>
513514
</ProjectReference>
515+
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj">
516+
<Project>{58e47288-fe26-4402-97a1-ede546f1d849}</Project>
517+
<Name>Xamarin.ExposureNotification</Name>
518+
</ProjectReference>
514519
</ItemGroup>
515520
<ItemGroup>
516521
<BundleResource Include="Resources\IconHamburger.png" />

‎Covid19Radar/Covid19Radar/Covid19Radar.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
<PackageReference Include="Prism.Forms" Version="7.2.0.1422" />
111111
<PackageReference Include="Prism.Plugin.Logging.AppCenter" Version="7.2.0.1114" />
112112
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
113-
<PackageReference Include="Xamarin.ExposureNotification" Version="0.11.0-preview" />
114113
<PackageReference Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
115114
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
116115
<PackageReference Include="Xamarin.Forms" Version="4.6.0.967" />
@@ -191,6 +190,9 @@
191190
<Folder Include="MultilingualResources\" />
192191
<Folder Include="Image\" />
193192
</ItemGroup>
193+
<ItemGroup>
194+
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj" />
195+
</ItemGroup>
194196
<ItemGroup>
195197
<None Update="Image\ic_hamburger.png">
196198
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

0 commit comments

Comments
 (0)