diff --git a/AppCenter-Demo.sln b/AppCenter-Demo.sln index 93d6252d3..301476b71 100644 --- a/AppCenter-Demo.sln +++ b/AppCenter-Demo.sln @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{274AB35C-6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.Forms.Demo", "Contoso.Forms.Demo", "{91CEE2C9-F64C-45C9-9353-B1EC87D13C6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contoso.Forms.Demo", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo\Contoso.Forms.Demo.csproj", "{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo\Contoso.Forms.Demo.csproj", "{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.Droid", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo.Droid\Contoso.Forms.Demo.Droid.csproj", "{3B39B339-86C4-47EF-8F85-811220494CA6}" EndProject @@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.UWP", "A EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contoso.UtilClassLibrary", "Apps\Contoso.UtilClassLibrary\Contoso.UtilClassLibrary.csproj", "{2AF3281C-D928-4886-9C68-775DADA56789}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.UWP.Demo", "Apps\Contoso.UWP.Demo\Contoso.UWP.Demo.csproj", "{612D30FE-E1F1-4CEE-8256-911C03A16890}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -40,6 +42,13 @@ Global Debug|iPhoneSimulator = Debug|iPhoneSimulator Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + GooglePlay|Any CPU = GooglePlay|Any CPU + GooglePlay|ARM = GooglePlay|ARM + GooglePlay|ARM64 = GooglePlay|ARM64 + GooglePlay|iPhone = GooglePlay|iPhone + GooglePlay|iPhoneSimulator = GooglePlay|iPhoneSimulator + GooglePlay|x64 = GooglePlay|x64 + GooglePlay|x86 = GooglePlay|x86 Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 @@ -47,9 +56,6 @@ Global Release|iPhoneSimulator = Release|iPhoneSimulator Release|x64 = Release|x64 Release|x86 = Release|x86 - GooglePlay|Any CPU = GooglePlay|Any CPU - GooglePlay|x64 = GooglePlay|x64 - GooglePlay|x86 = GooglePlay|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU @@ -94,6 +100,20 @@ Global {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x64.Build.0 = Debug|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x86.ActiveCfg = Debug|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x86.Build.0 = Debug|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|Any CPU.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|Any CPU.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|ARM.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|ARM.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|ARM64.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|ARM64.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|iPhone.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|iPhone.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|iPhoneSimulator.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|iPhoneSimulator.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x64.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x64.Build.0 = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x86.ActiveCfg = GooglePlay|Any CPU + {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x86.Build.0 = GooglePlay|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|Any CPU.Build.0 = Release|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|ARM.ActiveCfg = Release|Any CPU @@ -108,12 +128,6 @@ Global {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|x64.Build.0 = Release|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|x86.ActiveCfg = Release|Any CPU {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|x86.Build.0 = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|Any CPU.ActiveCfg = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|Any CPU.Build.0 = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x64.ActiveCfg = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x64.Build.0 = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x86.ActiveCfg = Release|Any CPU - {8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.GooglePlay|x86.Build.0 = Release|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -157,6 +171,24 @@ Global {3B39B339-86C4-47EF-8F85-811220494CA6}.Debug|x64.Build.0 = Debug|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Debug|x86.ActiveCfg = Debug|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Debug|x86.Build.0 = Debug|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|Any CPU.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|Any CPU.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM.Deploy.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM64.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM64.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|ARM64.Deploy.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhone.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhone.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhone.Deploy.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhoneSimulator.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhoneSimulator.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|iPhoneSimulator.Deploy.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x64.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x64.Build.0 = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x86.ActiveCfg = GooglePlay|Any CPU + {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x86.Build.0 = GooglePlay|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|Any CPU.Build.0 = Release|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|Any CPU.Deploy.0 = Release|Any CPU @@ -173,12 +205,6 @@ Global {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|x64.Build.0 = Release|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|x86.ActiveCfg = Release|Any CPU {3B39B339-86C4-47EF-8F85-811220494CA6}.Release|x86.Build.0 = Release|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|Any CPU.ActiveCfg = GooglePlay|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|Any CPU.Build.0 = GooglePlay|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x64.ActiveCfg = GooglePlay|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x64.Build.0 = GooglePlay|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x86.ActiveCfg = GooglePlay|Any CPU - {3B39B339-86C4-47EF-8F85-811220494CA6}.GooglePlay|x86.Build.0 = GooglePlay|Any CPU {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Ad-Hoc|ARM.ActiveCfg = Debug|iPhoneSimulator @@ -219,6 +245,17 @@ Global {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Debug|x64.Build.0 = Debug|iPhoneSimulator {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Debug|x86.Build.0 = Debug|iPhoneSimulator + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|ARM.ActiveCfg = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|ARM.Build.0 = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|ARM64.ActiveCfg = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|ARM64.Build.0 = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|iPhone.ActiveCfg = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|iPhone.Build.0 = Debug|iPhone + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|x64.ActiveCfg = Debug|iPhoneSimulator + {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|x86.ActiveCfg = Debug|iPhoneSimulator {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|Any CPU.ActiveCfg = Release|iPhone {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|Any CPU.Build.0 = Release|iPhone {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|ARM.ActiveCfg = Release|iPhone @@ -232,9 +269,6 @@ Global {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|x64.Build.0 = Release|iPhone {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|x86.ActiveCfg = Release|iPhone {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.Release|x86.Build.0 = Release|iPhone - {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|x64.ActiveCfg = Debug|iPhoneSimulator - {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}.GooglePlay|x86.ActiveCfg = Debug|iPhoneSimulator {665362D9-5EE2-45DE-A907-25DC86999A68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Ad-Hoc|Any CPU.Build.0 = Debug|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Ad-Hoc|ARM.ActiveCfg = Debug|ARM @@ -283,6 +317,24 @@ Global {665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.ActiveCfg = Debug|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.Build.0 = Debug|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.Deploy.0 = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|Any CPU.ActiveCfg = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|Any CPU.Build.0 = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM.ActiveCfg = Release|ARM + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM.Build.0 = Release|ARM + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM.Deploy.0 = Release|ARM + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM64.ActiveCfg = Debug|ARM64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM64.Build.0 = Debug|ARM64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|ARM64.Deploy.0 = Debug|ARM64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhone.ActiveCfg = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhone.Build.0 = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhone.Deploy.0 = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhoneSimulator.ActiveCfg = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhoneSimulator.Build.0 = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|iPhoneSimulator.Deploy.0 = Release|x64 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x64.ActiveCfg = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x64.Build.0 = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x86.ActiveCfg = Debug|x86 + {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x86.Build.0 = Debug|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.ActiveCfg = Release|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.Build.0 = Release|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.Deploy.0 = Release|x86 @@ -302,12 +354,6 @@ Global {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|x86.ActiveCfg = Release|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|x86.Build.0 = Release|x86 {665362D9-5EE2-45DE-A907-25DC86999A68}.Release|x86.Deploy.0 = Release|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|Any CPU.ActiveCfg = Debug|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|Any CPU.Build.0 = Debug|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x64.ActiveCfg = Debug|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x64.Build.0 = Debug|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x86.ActiveCfg = Debug|x86 - {665362D9-5EE2-45DE-A907-25DC86999A68}.GooglePlay|x86.Build.0 = Debug|x86 {2AF3281C-D928-4886-9C68-775DADA56789}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -350,6 +396,20 @@ Global {2AF3281C-D928-4886-9C68-775DADA56789}.Debug|x64.Build.0 = Debug|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Debug|x86.ActiveCfg = Debug|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Debug|x86.Build.0 = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|Any CPU.ActiveCfg = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|Any CPU.Build.0 = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|ARM.ActiveCfg = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|ARM.Build.0 = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|ARM64.ActiveCfg = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|ARM64.Build.0 = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|iPhone.ActiveCfg = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|iPhone.Build.0 = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|iPhoneSimulator.ActiveCfg = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|iPhoneSimulator.Build.0 = Release|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x64.ActiveCfg = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x64.Build.0 = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x86.ActiveCfg = Debug|Any CPU + {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x86.Build.0 = Debug|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Release|Any CPU.Build.0 = Release|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Release|ARM.ActiveCfg = Release|Any CPU @@ -364,12 +424,99 @@ Global {2AF3281C-D928-4886-9C68-775DADA56789}.Release|x64.Build.0 = Release|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Release|x86.ActiveCfg = Release|Any CPU {2AF3281C-D928-4886-9C68-775DADA56789}.Release|x86.Build.0 = Release|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|Any CPU.ActiveCfg = Debug|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|Any CPU.Build.0 = Debug|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x64.ActiveCfg = Debug|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x64.Build.0 = Debug|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x86.ActiveCfg = Debug|Any CPU - {2AF3281C-D928-4886-9C68-775DADA56789}.GooglePlay|x86.Build.0 = Debug|Any CPU + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|Any CPU.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|Any CPU.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM.ActiveCfg = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM.Build.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM.Deploy.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM64.ActiveCfg = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM64.Build.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|ARM64.Deploy.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhone.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhone.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhone.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x64.ActiveCfg = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x64.Build.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x64.Deploy.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x86.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x86.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Ad-Hoc|x86.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|Any CPU.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|Any CPU.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|Any CPU.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM.ActiveCfg = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM.Build.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM.Deploy.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM64.ActiveCfg = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM64.Build.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|ARM64.Deploy.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhone.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhone.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhone.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhoneSimulator.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhoneSimulator.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|iPhoneSimulator.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x64.ActiveCfg = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x64.Build.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x64.Deploy.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x86.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x86.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.AppStore|x86.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|Any CPU.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM.ActiveCfg = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM.Build.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM.Deploy.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM64.Build.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|iPhone.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x64.ActiveCfg = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x64.Build.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x64.Deploy.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x86.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x86.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Debug|x86.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|Any CPU.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|Any CPU.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|Any CPU.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM.ActiveCfg = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM.Build.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM.Deploy.0 = Debug|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM64.ActiveCfg = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM64.Build.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|ARM64.Deploy.0 = Debug|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhone.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhone.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhone.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhoneSimulator.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhoneSimulator.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|iPhoneSimulator.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x64.ActiveCfg = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x64.Build.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x64.Deploy.0 = Debug|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x86.ActiveCfg = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x86.Build.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.GooglePlay|x86.Deploy.0 = Debug|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|Any CPU.ActiveCfg = Release|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM.ActiveCfg = Release|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM.Build.0 = Release|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM.Deploy.0 = Release|ARM + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM64.ActiveCfg = Release|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM64.Build.0 = Release|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|ARM64.Deploy.0 = Release|ARM64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|iPhone.ActiveCfg = Release|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|iPhoneSimulator.ActiveCfg = Release|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x64.ActiveCfg = Release|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x64.Build.0 = Release|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x64.Deploy.0 = Release|x64 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x86.ActiveCfg = Release|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x86.Build.0 = Release|x86 + {612D30FE-E1F1-4CEE-8256-911C03A16890}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -381,6 +528,7 @@ Global {EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD} = {91CEE2C9-F64C-45C9-9353-B1EC87D13C6D} {665362D9-5EE2-45DE-A907-25DC86999A68} = {91CEE2C9-F64C-45C9-9353-B1EC87D13C6D} {2AF3281C-D928-4886-9C68-775DADA56789} = {274AB35C-68B4-4EFA-803B-8A7CFEC25EFC} + {612D30FE-E1F1-4CEE-8256-911C03A16890} = {274AB35C-68B4-4EFA-803B-8A7CFEC25EFC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9EE1C1FD-607B-470D-A253-43AD8A10A033} diff --git a/Apps/Contoso.Android.Puppet/ModulePages/AppCenterFragment.cs b/Apps/Contoso.Android.Puppet/ModulePages/AppCenterFragment.cs index 07397f984..777928f50 100644 --- a/Apps/Contoso.Android.Puppet/ModulePages/AppCenterFragment.cs +++ b/Apps/Contoso.Android.Puppet/ModulePages/AppCenterFragment.cs @@ -34,6 +34,7 @@ public class AppCenterFragment : PageFragment private LogLevel mLogWriteLevel = LogLevel.Verbose; private Switch AppCenterEnabledSwitch; + private Switch AppCenterNetworkRequestsAllowedSwitch; private TextView LogLevelLabel; private EditText LogWriteMessageText; private EditText LogWriteTagText; @@ -54,6 +55,7 @@ public override void OnViewCreated(View view, Bundle savedInstanceState) // Find views. AppCenterEnabledSwitch = view.FindViewById(Resource.Id.enabled_app_center) as Switch; + AppCenterNetworkRequestsAllowedSwitch = view.FindViewById(Resource.Id.appcenter_network_requests_allowed) as Switch; LogLevelLabel = view.FindViewById(Resource.Id.log_level) as TextView; LogWriteMessageText = view.FindViewById(Resource.Id.write_log_message) as EditText; LogWriteTagText = view.FindViewById(Resource.Id.write_log_tag) as EditText; @@ -65,6 +67,7 @@ public override void OnViewCreated(View view, Bundle savedInstanceState) // Subscribe to events. AppCenterEnabledSwitch.CheckedChange += UpdateEnabled; + AppCenterNetworkRequestsAllowedSwitch.CheckedChange += NetworkRequestAllowedChange; ((View)LogLevelLabel.Parent).Click += LogLevelClicked; ((View)LogWriteLevelLabel.Parent).Click += LogWriteLevelClicked; LogWriteButton.Click += WriteLog; @@ -86,6 +89,9 @@ protected override async void UpdateState() AppCenterEnabledSwitch.CheckedChange -= UpdateEnabled; AppCenterEnabledSwitch.Checked = await AppCenter.IsEnabledAsync(); AppCenterEnabledSwitch.CheckedChange += UpdateEnabled; + AppCenterNetworkRequestsAllowedSwitch.CheckedChange -= NetworkRequestAllowedChange; + AppCenterNetworkRequestsAllowedSwitch.Checked = AppCenter.IsNetworkRequestsAllowed; + AppCenterNetworkRequestsAllowedSwitch.CheckedChange += NetworkRequestAllowedChange; LogLevelLabel.Text = LogLevelNames[AppCenter.LogLevel]; LogWriteLevelLabel.Text = LogLevelNames[mLogWriteLevel]; } @@ -117,6 +123,11 @@ private async void UpdateEnabled(object sender, CompoundButton.CheckedChangeEven AppCenterEnabledSwitch.Checked = await AppCenter.IsEnabledAsync(); } + private void NetworkRequestAllowedChange(object sender, CompoundButton.CheckedChangeEventArgs e) + { + AppCenter.IsNetworkRequestsAllowed = e.IsChecked; + } + private void LogLevelClicked(object sender, EventArgs e) { var intent = new Intent(Activity.ApplicationContext, typeof(LogLevelActivity)); diff --git a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml index 5c16454fc..37cbdebbc 100644 --- a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs index 9849fea90..350055643 100644 --- a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs @@ -28,5 +28,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] -[assembly: AssemblyInformationalVersion("4.2.0-SNAPSHOT")] +[assembly: AssemblyFileVersion("4.3.0.0")] +[assembly: AssemblyInformationalVersion("4.3.0-SNAPSHOT")] diff --git a/Apps/Contoso.Android.Puppet/Resources/layout/AppCenter.axml b/Apps/Contoso.Android.Puppet/Resources/layout/AppCenter.axml index 954ad2dee..1c74cfe54 100644 --- a/Apps/Contoso.Android.Puppet/Resources/layout/AppCenter.axml +++ b/Apps/Contoso.Android.Puppet/Resources/layout/AppCenter.axml @@ -28,6 +28,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + + + + Write User Id User Id Analytics Enabled + Allow network requests Event Name Properties Add Property diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj index b6a54468a..e6817c1a0 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj @@ -8,7 +8,7 @@ Library Contoso.Forms.Demo.Droid Contoso.Forms.Demo.Droid - v9.0 + v11.0 True Resources\Resource.designer.cs Resource @@ -61,7 +61,7 @@ d8 r8 true - armeabi-v7a + armeabi-v7a;x86;arm64-v8a;x86_64 @@ -70,14 +70,14 @@ - + - + - - + + @@ -114,8 +114,5 @@ - - - diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml index 457d1c7b9..222562e06 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs index b5172d71a..0c0b452de 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs @@ -22,8 +22,8 @@ // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] -[assembly: AssemblyInformationalVersion("4.2.0")] +[assembly: AssemblyFileVersion("4.3.0.0")] +[assembly: AssemblyInformationalVersion("4.3.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Contoso.Forms.Demo.UWP.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Contoso.Forms.Demo.UWP.csproj index c7f47e870..b19b29a27 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Contoso.Forms.Demo.UWP.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Contoso.Forms.Demo.UWP.csproj @@ -135,9 +135,9 @@ - - - + + + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Package.appxmanifest b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Package.appxmanifest index 897d9bee2..009fd6ad9 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Package.appxmanifest +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Package.appxmanifest @@ -1,6 +1,6 @@ - + AppCenter-Contoso.Forms.Demo.UWP diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs index 23388f069..823f5c129 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs @@ -27,5 +27,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.3.0.0")] [assembly: ComVisible(false)] diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj index 32ef04223..4a7bc774b 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj @@ -87,9 +87,9 @@ - - - + + + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist index ed97248b3..67561fc70 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist @@ -5,7 +5,7 @@ CFBundleIdentifier com.microsoft.appcenter.xamarin.forms.ios.demo CFBundleVersion - 4.2.0 + 4.3.0 LSRequiresIPhoneOS MinimumOSVersion @@ -39,7 +39,7 @@ CFBundleName ACFDemo CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleURLTypes diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj index 4bbc324e9..e946f352a 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj @@ -4,14 +4,30 @@ netstandard2.0 Microsoft Corp. All rights reserved. Microsoft Corporation - 4.2.0 + 4.3.0 0.0.0.0 - 4.2.0.0 + 4.3.0.0 + Debug;Release;GooglePlay + + pdbonly + true + bin\GooglePlay + TRACE;GOOGLEPLAY;NETSTANDARD;NETSTANDARD2_0; + 4 + 1701;1702 + obj\GooglePlay + false + + + + + + + - - - + + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml index bae60c5e0..2c052da26 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml @@ -3,6 +3,7 @@ + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml.cs index d9343d7a0..c18baeacc 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml.cs @@ -30,6 +30,7 @@ protected override async void OnAppearing() { base.OnAppearing(); AppCenterEnabledSwitchCell.On = await AppCenter.IsEnabledAsync(); + AllowedNetworkRequestSwitchCell.On = AppCenter.IsNetworkRequestsAllowed; if (Application.Current.Properties.ContainsKey(Constants.UserId) && Application.Current.Properties[Constants.UserId] is string id) { UserIdEntry.Text = id; @@ -44,6 +45,11 @@ protected override async void OnAppearing() }; } + void AllowedNetworkRequestEnabled(System.Object sender, Xamarin.Forms.ToggledEventArgs e) + { + AppCenter.IsNetworkRequestsAllowed = e.Value; + } + async void ChangeStartType(object sender, PropertyChangedEventArgs e) { // IOS sends an event every time user rests their selection on an item without hitting "done", and the only event they send when hitting "done" is that the control is no longer focused. diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml index 9e408100d..5ba42e3dd 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs index af66ac9ce..e9238f3e8 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs @@ -22,8 +22,8 @@ // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] -[assembly: AssemblyInformationalVersion("4.2.0-SNAPSHOT")] +[assembly: AssemblyFileVersion("4.3.0.0")] +[assembly: AssemblyInformationalVersion("4.3.0-SNAPSHOT")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest index 34bb13d9b..fb07a984d 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest @@ -1,6 +1,6 @@ - + AppCenter-Contoso.Forms.Puppet.UWP diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs index 4b2326ddd..7c736aeb5 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs @@ -27,5 +27,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.3.0.0")] [assembly: ComVisible(false)] diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist index 81aa61066..0b94919bd 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist @@ -5,9 +5,9 @@ CFBundleIdentifier com.microsoft.appcenter.xamarin.forms.ios.puppet CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleVersion - 4.2.0 + 4.3.0 LSRequiresIPhoneOS MinimumOSVersion diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml index f676147c7..4e79eec9d 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml @@ -3,6 +3,7 @@ + diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml.cs index 5b0eef130..9943a0561 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml.cs +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml.cs @@ -33,6 +33,7 @@ protected override async void OnAppearing() { base.OnAppearing(); AppCenterEnabledSwitchCell.On = await AppCenter.IsEnabledAsync(); + AllowedNetworkRequestSwitchCell.On = AppCenter.IsNetworkRequestsAllowed; if (Application.Current.Properties.ContainsKey(Constants.UserId) && Application.Current.Properties[Constants.UserId] is string id) { UserIdEntry.Text = id; @@ -87,5 +88,10 @@ private void SaveStorageSize_Clicked(object sender, System.EventArgs e) AppCenterLog.Error(LogTag, "Wrong number value for the max storage size."); } } + + void AllowedNetworkRequestEnabled(System.Object sender, Xamarin.Forms.ToggledEventArgs e) + { + AppCenter.IsNetworkRequestsAllowed = e.Value; + } } } diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs index c04d5fc71..028dfb4e5 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs @@ -20,8 +20,8 @@ // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] -[assembly: AssemblyInformationalVersion("4.2.0-SNAPSHOT")] +[assembly: AssemblyFileVersion("4.3.0.0")] +[assembly: AssemblyInformationalVersion("4.3.0-SNAPSHOT")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj b/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj index d8dbea2a8..fd1f420a1 100644 --- a/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj +++ b/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj @@ -152,8 +152,8 @@ - - + + diff --git a/Apps/Contoso.UWP.Demo/Package.appxmanifest b/Apps/Contoso.UWP.Demo/Package.appxmanifest index 8919efd1f..5011f8679 100644 --- a/Apps/Contoso.UWP.Demo/Package.appxmanifest +++ b/Apps/Contoso.UWP.Demo/Package.appxmanifest @@ -1,6 +1,6 @@ - + AppCenter-Contoso.UWP.Demo diff --git a/Apps/Contoso.UWP.Demo/Properties/AssemblyInfo.cs b/Apps/Contoso.UWP.Demo/Properties/AssemblyInfo.cs index 57ea980f8..7ceef0905 100644 --- a/Apps/Contoso.UWP.Demo/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.UWP.Demo/Properties/AssemblyInfo.cs @@ -27,5 +27,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.3.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Apps/Contoso.UWP.Puppet/Package.appxmanifest b/Apps/Contoso.UWP.Puppet/Package.appxmanifest index 930e83503..529f3a7a3 100644 --- a/Apps/Contoso.UWP.Puppet/Package.appxmanifest +++ b/Apps/Contoso.UWP.Puppet/Package.appxmanifest @@ -1,6 +1,6 @@ - + AppCenter-Contoso.UWP.Puppet diff --git a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs index ae4e257f4..8d4c90e9e 100644 --- a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs @@ -27,5 +27,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.3.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Apps/Contoso.WPF.Demo.DotNetCore/Contoso.WPF.Demo.DotNetCore.csproj b/Apps/Contoso.WPF.Demo.DotNetCore/Contoso.WPF.Demo.DotNetCore.csproj index 99c6939f1..a870c2d29 100644 --- a/Apps/Contoso.WPF.Demo.DotNetCore/Contoso.WPF.Demo.DotNetCore.csproj +++ b/Apps/Contoso.WPF.Demo.DotNetCore/Contoso.WPF.Demo.DotNetCore.csproj @@ -4,13 +4,13 @@ WinExe netcoreapp3.0 true - 4.2.0 + 4.3.0 0.0.0.0 - 4.2.0.0 + 4.3.0.0 - - + + diff --git a/Apps/Contoso.WPF.Demo.DotNetCore/MainWindow.xaml b/Apps/Contoso.WPF.Demo.DotNetCore/MainWindow.xaml index 9d444ebea..4c50e4594 100644 --- a/Apps/Contoso.WPF.Demo.DotNetCore/MainWindow.xaml +++ b/Apps/Contoso.WPF.Demo.DotNetCore/MainWindow.xaml @@ -10,6 +10,7 @@ + @@ -18,10 +19,15 @@ - + + +