microsoft
/
appcenter-sdk-dotnet
зеркало из https://github.com/microsoft/appcenter-sdk-dotnet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge remote-tracking branch 'origin/feature/arm64' into fix/produce-unsymbolicated-crashes

This commit is contained in:
Guillaume Perrot 2020-01-08 17:31:38 -08:00
Родитель aba9216c0c 696cdf2c36
Коммит 6b6f21b227
4 изменённых файлов: 67 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
AppCenter-Windows.sln
Просмотреть файл

@ -469,7 +469,7 @@ Global
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|ARM.ActiveCfg = Debug|ARM
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|ARM.Build.0 = Debug|ARM
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|ARM.Deploy.0 = Debug|ARM
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|ARM64.ActiveCfg = Debug|ARM
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|ARM64.ActiveCfg = Debug|x86
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x64.ActiveCfg = Debug|x64
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x64.Build.0 = Debug|x64
{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x64.Deploy.0 = Debug|x64
@ -757,7 +757,9 @@ Global
{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|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|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
@ -768,7 +770,9 @@ Global
{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|x86
{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|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
@ -781,7 +785,9 @@ Global
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM.ActiveCfg = Debug|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM.Build.0 = Debug|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM.Deploy.0 = Debug|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM64.ActiveCfg = Debug|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM64.ActiveCfg = Debug|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM64.Build.0 = Debug|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|ARM64.Deploy.0 = Debug|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x64.ActiveCfg = Debug|x64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x64.Build.0 = Debug|x64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x64.Deploy.0 = Debug|x64
@ -794,7 +800,9 @@ Global
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM.ActiveCfg = Release|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM.Build.0 = Release|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM.Deploy.0 = Release|ARM
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM64.ActiveCfg = Release|x86
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM64.ActiveCfg = Release|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM64.Build.0 = Release|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|ARM64.Deploy.0 = Release|ARM64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|x64.ActiveCfg = Release|x64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|x64.Build.0 = Release|x64
{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|x64.Deploy.0 = Release|x64

24
Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj
Просмотреть файл

@ -19,6 +19,7 @@
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<PackageCertificateKeyFile>Contoso.UWP.Demo_StoreKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>A1C0F717D60E89D6D1AB0D04219866BB27286CB1</PackageCertificateThumbprint>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-arm64;win10-arm64-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@ -89,6 +90,29 @@
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>

25
Apps/Contoso.UWP.Puppet/Contoso.UWP.Puppet.csproj
Просмотреть файл

@ -18,7 +18,7 @@
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>Contoso.UWP.Puppet_StoreKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>0CCED2432489A8B2A1E6CDBD5CE45E8E56B25CFB</PackageCertificateThumbprint>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-arm64;win10-arm64-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@ -90,6 +90,29 @@
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>

8
SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.UWP/Utils/ProcessInformation.cs
Просмотреть файл

@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
using Windows.ApplicationModel;
using System.Runtime.InteropServices;
using Windows.System.Diagnostics;
namespace Microsoft.AppCenter.Crashes.Utils
@ -19,6 +19,10 @@ namespace Microsoft.AppCenter.Crashes.Utils
public string ParentProcessName => ProcessDiagnosticInfo.GetForCurrentProcess().Parent?.ExecutableFileName;
public string ProcessArchitecture => Package.Current.Id.Architecture.ToString();
/// <remarks>
/// ARM64 was added to ProcessorArchitecture enum (that can be received by Package.Current.Id.Architecture call) only in SDK version 18362,
/// so casting to string is incorrect on lower versions.
/// </remarks>
public string ProcessArchitecture => RuntimeInformation.ProcessArchitecture.ToString();
}
}