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

Commit

Permalink
Merge pull request #711 from Covid-19Radar/master
Browse files Browse the repository at this point in the history 
RC7
  • Loading branch information
@kazumihirose
kazumihirose authored Jun 28, 2020
2 parents 9c30f16 + df58dd6 commit b03037f
Show file tree
Hide file tree
Showing 21 changed files with 1,442 additions and 284 deletions.
32 changes: 32 additions & 0 deletions Covid19Radar.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{460BECFC
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Covid19Radar.UITest", "Covid19Radar\Tests\Covid19Radar.UITest\Covid19Radar.UITest.csproj", "{4223EE63-A661-4465-BBB0-08DD80DB2256}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ExposureNotification", "Covid19Radar\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj", "{58E47288-FE26-4402-97A1-EDE546F1D849}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Expand Down Expand Up @@ -165,6 +167,36 @@ Global
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhone.Build.0 = Release|Any CPU
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4223EE63-A661-4465-BBB0-08DD80DB2256}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhone.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|Any CPU.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|Any CPU.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhone.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhone.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug_Mock|iPhoneSimulator.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhone.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|Any CPU.Build.0 = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhone.ActiveCfg = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhone.Build.0 = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{58E47288-FE26-4402-97A1-EDE546F1D849}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 4 additions & 0 deletions Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@
<Project>{554EE1AB-B447-480C-90E5-C4F040891DE6}</Project>
<Name>Covid19Radar</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj">
<Project>{58e47288-fe26-4402-97a1-ede546f1d849}</Project>
<Name>Xamarin.ExposureNotification</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
Expand Down
7 changes: 6 additions & 1 deletion Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
<CrashReportingDelay>-1</CrashReportingDelay>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<MtouchInterpreter>-all</MtouchInterpreter>
<MtouchInterpreter>
</MtouchInterpreter>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DefineConstants>DEBUG;__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
Expand Down Expand Up @@ -511,6 +512,10 @@
<Project>{554EE1AB-B447-480C-90E5-C4F040891DE6}</Project>
<Name>Covid19Radar</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj">
<Project>{58e47288-fe26-4402-97a1-ede546f1d849}</Project>
<Name>Xamarin.ExposureNotification</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\IconHamburger.png" />
Expand Down
4 changes: 3 additions & 1 deletion Covid19Radar/Covid19Radar/Covid19Radar.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
<PackageReference Include="Prism.Forms" Version="7.2.0.1422" />
<PackageReference Include="Prism.Plugin.Logging.AppCenter" Version="7.2.0.1114" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.ExposureNotification" Version="0.11.0-preview" />
<PackageReference Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
<PackageReference Include="Xamarin.Forms" Version="4.6.0.967" />
Expand Down Expand Up @@ -191,6 +190,9 @@
<Folder Include="MultilingualResources\" />
<Folder Include="Image\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="Image\ic_hamburger.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
Loading

0 comments on commit b03037f

Please sign in to comment.