Skip to content

Commit

Permalink
Merge pull request #1741 from microsoft/release/5.0.2
Browse files Browse the repository at this point in the history
Start 5.0.2 version
  • Loading branch information
MikhailSuendukov authored May 18, 2023
2 parents 86cf6e7 + 744b998 commit 49e5fac
Show file tree
Hide file tree
Showing 89 changed files with 239 additions and 323 deletions.
92 changes: 37 additions & 55 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,48 +15,37 @@ jobs:
strategy:
fail-fast: false

runs-on: macos-latest
runs-on: macOS-12

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
uses: github/codeql-action/init@v2
with:
languages: csharp

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

steps:
- name: Run the Cake script
uses: cake-build/cake-action@v1
with:
target: Externals-Apple
- name: Install workloads
run: dotnet workload install android ios macos -v diagnostic
- name: Run the Cake script
uses: cake-build/cake-action@v1
env:
STORAGE_AUTH_PARAMS: ${{ secrets.STORAGE_AUTH_PARAMS }}
with:
target: Externals-Apple
cake-version: 2.2.0

- run: |
echo "Build App Center For iOS"
msbuild SDK/AppCenter/Microsoft.AppCenter.iOS/Microsoft.AppCenter.iOS.csproj /p:Configuration=Release /restore /t:Build
msbuild SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS/Microsoft.AppCenter.Analytics.iOS.csproj /p:UseSharedCompilation=false /restore /t:Build
msbuild SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Microsoft.AppCenter.Crashes.iOS.csproj /p:UseSharedCompilation=false /restore /t:Build
msbuild SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS/Microsoft.AppCenter.Distribute.iOS.csproj /p:UseSharedCompilation=false /restore /t:Build
dotnet msbuild SDK/AppCenter/Microsoft.AppCenter.Apple/Microsoft.AppCenter.Apple.csproj /p:Configuration=Release /restore /t:Build
dotnet msbuild SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/Microsoft.AppCenter.Analytics.Apple.csproj /p:UseSharedCompilation=false /restore /t:Build
dotnet msbuild SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj /p:UseSharedCompilation=false /restore /t:Build
dotnet msbuild SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.csproj /p:UseSharedCompilation=false /restore /t:Build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

Expand All @@ -66,55 +55,48 @@ jobs:
fail-fast: false

runs-on: windows-2019
env:
STORAGE_AUTH_PARAMS: ${{ secrets.STORAGE_AUTH_PARAMS }}

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1

# Override language selection by uncommenting this and choosing your languages
uses: github/codeql-action/init@v2
with:
languages: csharp

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language


- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'microsoft'
java-version: '11'

- name: Install workloads
run: dotnet workload install android

- run: |
echo "Run Externals-Android"
.\build.ps1 --target="Externals-Android"
- run: |
echo "Build App Center"
$Env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
MSBuild.exe AppCenter-SDK-Build-Windows.sln -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild AppCenter-SDK-Build-Windows.sln -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
- run: |
echo "Build App Center For Android"
$Env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
MSBuild.exe SDK/AppCenter/Microsoft.AppCenter.Android/Microsoft.AppCenter.Android.csproj -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Microsoft.AppCenter.Analytics.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Microsoft.AppCenter.Crashes.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
MSBuild.exe SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Microsoft.AppCenter.Distribute.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenter/Microsoft.AppCenter.Android/Microsoft.AppCenter.Android.csproj -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Microsoft.AppCenter.Analytics.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Microsoft.AppCenter.Crashes.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
dotnet msbuild SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Microsoft.AppCenter.Distribute.Android.csproj -property:UseSharedCompilation=false -property:Configuration=Release /restore -target:Build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 1 addition & 1 deletion Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="111" android:versionName="5.0.1-SNAPSHOT" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="112" android:versionName="5.0.2-SNAPSHOT" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="SXPuppet" android:icon="@drawable/Icon" android:theme="@style/PuppetTheme"></application>
</manifest>
4 changes: 2 additions & 2 deletions Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.2.0")]
[assembly: AssemblyInformationalVersion("5.0.2-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,22 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<Run>am start -e "XAMARIN_FORMS_ANDROID_PROD" "{XAMARIN_FORMS_ANDROID_PROD}" -e "XAMARIN_FORMS_ANDROID_TARGET_TOKEN_PROD" "{XAMARIN_FORMS_ANDROID_TARGET_TOKEN_PROD}" -n "com.microsoft.appcenter.xamarin.forms.demo/Contoso.Forms.Demo.Droid.MainActivity"</Run>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)'=='GooglePlay' ">
<PackageReference Include="Microsoft.AppCenter.DistributePlay" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.DistributePlay" Version="5.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)'!='GooglePlay' ">
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.2" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
16 changes: 1 addition & 15 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,16 @@ namespace Contoso.Forms.Demo.Droid
{

[Activity(Label = "ACFDemo", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, LaunchMode = LaunchMode.SingleTop)]
public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity, IClearCrashClick, IAppConfiguration
public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity, IClearCrashClick
{
public static readonly int FileAttachmentId = 1;

private const string CrashesUserConfirmationStorageKey = "com.microsoft.appcenter.crashes.always.send";
private static string AppCenterSecret;
private static string AppCenterTargetToken;

public TaskCompletionSource<string> FileAttachmentTaskCompletionSource { set; get; }

protected override void OnCreate(Bundle savedInstanceState)
{
AppCenterSecret = Intent.GetStringExtra("XAMARIN_FORMS_ANDROID_PROD");
AppCenterTargetToken = Intent.GetStringExtra("XAMARIN_FORMS_ANDROID_TARGET_TOKEN_PROD");
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;

Expand Down Expand Up @@ -62,16 +58,6 @@ public void ClearCrashButton()
ISharedPreferences appCenterPreferences = Android.App.Application.Context.GetSharedPreferences("AppCenter", FileCreationMode.Private);
appCenterPreferences.Edit().Remove(CrashesUserConfirmationStorageKey).Apply();
}

public string GetAppSecret()
{
return AppCenterSecret;
}

public string GetTargetToken()
{
return AppCenterTargetToken;
}
}

public class AndroidAnalyticsListener : Java.Lang.Object, IAnalyticsListener
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.forms.demo" android:versionName="5.0.0" android:versionCode="96">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.forms.demo" android:versionName="5.0.2" android:versionCode="97">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="ACFDemo"></application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0")]
[assembly: AssemblyFileVersion("5.0.2.0")]
[assembly: AssemblyInformationalVersion("5.0.2")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,16 @@
<LinkMode>SdkOnly</LinkMode>
<HttpClientHandler></HttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<EnvironmentVariables>
<Variable name="XAMARIN_FORMS_MACOS_PROD" value="{XAMARIN_FORMS_MACOS_PROD}" />
</EnvironmentVariables>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.2" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" />
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
Expand Down Expand Up @@ -93,7 +88,6 @@
<DependentUpon>ViewController.cs</DependentUpon>
</Compile>
<Compile Include="FilePicker.cs" />
<Compile Include="AppConfiguration.cs" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="Main.storyboard" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.Contoso-Forms-Demo-MacOS</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.2</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.2</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CFBundleDevelopmentRegion</key>
Expand Down
23 changes: 0 additions & 23 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/AppConfiguration.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="AppConfiguration.cs" />
<Compile Include="ClearCrashes.cs" />
<Compile Include="EventFilter.cs" />
<Compile Include="EventFilterWrapper.cs" />
Expand Down Expand Up @@ -136,9 +135,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.0-r0005-370fc7b" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.2" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" />
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.2" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Demo.UWP" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.0.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Demo.UWP" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.2.0" />
<mp:PhoneIdentity PhoneProductId="fbe02dcf-2c7d-4740-9c2b-0df5e15916e5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.Forms.Demo.UWP</DisplayName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.0.2.0")]
[assembly: ComVisible(false)]
Loading

0 comments on commit 49e5fac

Please sign in to comment.