Skip to content

Commit c45a943

Browse files
MikhailSuendukovMikhailSuendukov
authored
Merge pull request #1809 from microsoft/master
Update dev branch
2 parents 10c6e0f + c663229 commit c45a943

File tree

17 files changed

+65
-76
lines changed

17 files changed

+65
-76
lines changed

‎Apps/Contoso.MAUI.Demo/Contoso.MAUI.Demo.csproj‎

Lines changed: 23 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,20 @@
1111
<UsingMauiEssentials>true</UsingMauiEssentials>
1212
<SingleProject>true</SingleProject>
1313
<ImplicitUsings>enable</ImplicitUsings>
14-
<Version>5.0.6</Version>
14+
<Version>5.0.7</Version>
1515
<!-- Display name -->
1616
<ApplicationTitle>Contoso.MAUI.Demo</ApplicationTitle>
1717
<!-- App Identifier -->
1818
<ApplicationId>com.microsoft.appcenter.Contoso.MAUI.Demo</ApplicationId>
1919
<ApplicationIdGuid>d7a06185-3470-4ae9-8a6f-27a861f146b2</ApplicationIdGuid>
20-
<SupportedOSPlatformVersion
21-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
22-
<SupportedOSPlatformVersion
23-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
24-
<SupportedOSPlatformVersion
25-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
26-
<SupportedOSPlatformVersion
27-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
20+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
21+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
22+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
23+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
2824
10.0.17763.0</SupportedOSPlatformVersion>
29-
<TargetPlatformMinVersion
30-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
25+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
3126
10.0.17763.0</TargetPlatformMinVersion>
32-
<SupportedOSPlatformVersion
33-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
27+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
3428
<Configurations>Debug;Release;GooglePlay</Configurations>
3529
</PropertyGroup>
3630
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GooglePlay|AnyCPU' ">
@@ -44,15 +38,13 @@
4438
<NoWarn></NoWarn>
4539
<NoStdLib>false</NoStdLib>
4640
</PropertyGroup>
47-
<PropertyGroup
48-
Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
41+
<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
4942
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
5043
<ForceSimulatorX64ArchitectureInIDE>true</ForceSimulatorX64ArchitectureInIDE>
5144
</PropertyGroup>
5245
<ItemGroup>
5346
<!-- App Icon -->
54-
<MauiIcon Include="Resources\AppIcon\appicon.svg"
55-
ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
47+
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
5648
<!-- Splash Screen -->
5749
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
5850
<!-- Images -->
@@ -71,44 +63,28 @@
7163
<None Remove="Platforms\iOS\Resources\Images\lightning.png" />
7264
<None Remove="Platforms\iOS\Resources\Images\socket.png" />
7365
</ItemGroup>
74-
7566
<ItemGroup Condition=" '$(Configuration)'=='Release' ">
76-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
77-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
67+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
68+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
7869
</ItemGroup>
7970
<ItemGroup Condition=" '$(Configuration)'!='GooglePlay' ">
80-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.6" />
71+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.7" />
8172
</ItemGroup>
8273
<ItemGroup Condition=" '$(Configuration)'=='GooglePlay' ">
83-
<PackageReference Include="Microsoft.AppCenter.DistributePlay" Version="5.0.6" />
74+
<PackageReference Include="Microsoft.AppCenter.DistributePlay" Version="5.0.7" />
8475
</ItemGroup>
85-
8676
<!-- When using debug build specify the target framework to import appropriate platform SDKs otherwise build wont compile.
8777
e.g. dotnet build -t:Run -f net8.0-android -c Debug -p:TargetFrameworks=net8.0-android -->
88-
89-
<ItemGroup
90-
Condition=" '$(Configuration)'=='Debug' And !$(TargetFramework.Contains('-android')) ">
91-
<ProjectReference
92-
Include="..\..\SDK\AppCenter\Microsoft.AppCenter.Apple\Microsoft.AppCenter.Apple.csproj" />
93-
<ProjectReference
94-
Include="..\..\SDK\AppCenterAnalytics\Microsoft.AppCenter.Analytics.Apple\Microsoft.AppCenter.Analytics.Apple.csproj" />
95-
<ProjectReference
96-
Include="..\..\SDK\AppCenterCrashes\Microsoft.AppCenter.Crashes.Apple\Microsoft.AppCenter.Crashes.Apple.csproj" />
97-
<ProjectReference
98-
Condition=" $(TargetFramework.Contains('-ios')) "
99-
Include="..\..\SDK\AppCenterDistribute\Microsoft.AppCenter.Distribute.Apple\Microsoft.AppCenter.Distribute.Apple.csproj" />
78+
<ItemGroup Condition=" '$(Configuration)'=='Debug' And !$(TargetFramework.Contains('-android')) ">
79+
<ProjectReference Include="..\..\SDK\AppCenter\Microsoft.AppCenter.Apple\Microsoft.AppCenter.Apple.csproj" />
80+
<ProjectReference Include="..\..\SDK\AppCenterAnalytics\Microsoft.AppCenter.Analytics.Apple\Microsoft.AppCenter.Analytics.Apple.csproj" />
81+
<ProjectReference Include="..\..\SDK\AppCenterCrashes\Microsoft.AppCenter.Crashes.Apple\Microsoft.AppCenter.Crashes.Apple.csproj" />
82+
<ProjectReference Condition=" $(TargetFramework.Contains('-ios')) " Include="..\..\SDK\AppCenterDistribute\Microsoft.AppCenter.Distribute.Apple\Microsoft.AppCenter.Distribute.Apple.csproj" />
10083
</ItemGroup>
101-
102-
<ItemGroup
103-
Condition=" '$(Configuration)'=='Debug' And $(TargetFramework.Contains('-android'))">
104-
<ProjectReference
105-
Include="..\..\SDK\AppCenter\Microsoft.AppCenter.Android\Microsoft.AppCenter.Android.csproj" />
106-
<ProjectReference
107-
Include="..\..\SDK\AppCenterAnalytics\Microsoft.AppCenter.Analytics.Android\Microsoft.AppCenter.Analytics.Android.csproj" />
108-
<ProjectReference
109-
Include="..\..\SDK\AppCenterCrashes\Microsoft.AppCenter.Crashes.Android\Microsoft.AppCenter.Crashes.Android.csproj" />
110-
<ProjectReference
111-
Include="..\..\SDK\AppCenterDistribute\Microsoft.AppCenter.Distribute.Android\Microsoft.AppCenter.Distribute.Android.csproj" />
84+
<ItemGroup Condition=" '$(Configuration)'=='Debug' And $(TargetFramework.Contains('-android'))">
85+
<ProjectReference Include="..\..\SDK\AppCenter\Microsoft.AppCenter.Android\Microsoft.AppCenter.Android.csproj" />
86+
<ProjectReference Include="..\..\SDK\AppCenterAnalytics\Microsoft.AppCenter.Analytics.Android\Microsoft.AppCenter.Analytics.Android.csproj" />
87+
<ProjectReference Include="..\..\SDK\AppCenterCrashes\Microsoft.AppCenter.Crashes.Android\Microsoft.AppCenter.Crashes.Android.csproj" />
88+
<ProjectReference Include="..\..\SDK\AppCenterDistribute\Microsoft.AppCenter.Distribute.Android\Microsoft.AppCenter.Distribute.Android.csproj" />
11289
</ItemGroup>
113-
11490
</Project>

‎Apps/Contoso.MAUI.Demo/Platforms/Windows/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
66
IgnorableNamespaces="uap rescap">
77

8-
<Identity Name="maui-package-name-placeholder" Publisher="CN=Microsoft" Version="5.0.6.0" />
8+
<Identity Name="maui-package-name-placeholder" Publisher="CN=Microsoft" Version="5.0.7.0" />
99

1010
<Properties>
1111
<DisplayName>$placeholder$</DisplayName>

‎Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@
149149
</Page>
150150
</ItemGroup>
151151
<ItemGroup>
152-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
153-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
152+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
153+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
154154
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
155155
</ItemGroup>
156156
<ItemGroup>

‎Apps/Contoso.UWP.Demo/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
3-
<Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Demo" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.6.0" />
3+
<Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Demo" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.7.0" />
44
<mp:PhoneIdentity PhoneProductId="3bda7e44-ab20-4885-b6a0-121b9f9e33d7" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>AppCenter-Contoso.UWP.Demo</DisplayName>

‎Apps/Contoso.UWP.Demo/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
// by using the '*' as shown below:
2828
// [assembly: AssemblyVersion("1.0.*")]
2929
[assembly: AssemblyVersion("0.0.0.0")]
30-
[assembly: AssemblyFileVersion("5.0.6.0")]
30+
[assembly: AssemblyFileVersion("5.0.7.0")]
3131
[assembly: ComVisible(false)]

‎Apps/Contoso.WPF.Demo.DotNetCore/Contoso.WPF.Demo.DotNetCore.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<UseWPF>true</UseWPF>
7-
<Version>5.0.6</Version>
7+
<Version>5.0.7</Version>
88
<AssemblyVersion>0.0.0.0</AssemblyVersion>
9-
<FileVersion>5.0.6.0</FileVersion>
9+
<FileVersion>5.0.7.0</FileVersion>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
13-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
12+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
13+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
1414
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
1515
</ItemGroup>
1616
<ItemGroup>

‎Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
</ProjectReference>
116116
</ItemGroup>
117117
<ItemGroup>
118-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
119-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
118+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
119+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
120120
</ItemGroup>
121121
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122122
</Project>

‎Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
3232
[assembly: AssemblyVersion("0.0.0.0")]
33-
[assembly: AssemblyFileVersion("5.0.6.0")]
34-
[assembly: AssemblyInformationalVersion("5.0.6")]
33+
[assembly: AssemblyFileVersion("5.0.7.0")]
34+
[assembly: AssemblyInformationalVersion("5.0.7")]

‎Apps/Contoso.WinForms.Demo.DotNetCore/Contoso.WinForms.Demo.DotNetCore.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
7-
<Version>5.0.6</Version>
7+
<Version>5.0.7</Version>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
11-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
10+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
11+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
1212
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
1313
</ItemGroup>
1414
<ItemGroup>

‎Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<None Include="App.config" />
8282
</ItemGroup>
8383
<ItemGroup>
84-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
85-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
84+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.7" />
85+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.7" />
8686
</ItemGroup>
8787
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8888
</Project>

0 commit comments

Comments
 (0)