diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e0bc01321..f2827bbc3 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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 @@ -66,35 +55,30 @@ 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" @@ -102,19 +86,17 @@ jobs: - 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 diff --git a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml index 280636a2a..ff6537366 100644 --- a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs index 25afcba50..72f090d79 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("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-SNAPSHOT")] 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 e1eb9d0f7..e980663a8 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 @@ -63,9 +63,6 @@ true armeabi-v7a;x86;arm64-v8a;x86_64 - - 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" - @@ -73,15 +70,15 @@ - + - + - - - + + + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs index 9f561b419..dd402e89b 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs @@ -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 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; @@ -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 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 710a9b917..f4771349f 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 @@ - + \ No newline at end of file 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 4dc3565f3..e466bf218 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("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. diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/AppConfiguration.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/AppConfiguration.cs deleted file mode 100644 index 686ee200c..000000000 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/AppConfiguration.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using Contoso.Forms.Demo.MacOS; -using Xamarin.Forms; - -[assembly: Dependency(typeof(AppConfiguration))] -namespace Contoso.Forms.Demo.MacOS -{ - public class AppConfiguration: IAppConfiguration - { - public AppConfiguration() - { - } - - public string GetAppSecret() - { - return Environment.GetEnvironmentVariable("XAMARIN_FORMS_MACOS_PROD"); - } - - public string GetTargetToken() - { - return ""; - } - } -} diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Contoso.Forms.Demo.MacOS.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Contoso.Forms.Demo.MacOS.csproj index cfa6fb54f..9c8da5835 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Contoso.Forms.Demo.MacOS.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Contoso.Forms.Demo.MacOS.csproj @@ -47,21 +47,16 @@ SdkOnly - - - - - - - - - + + + + @@ -93,7 +88,6 @@ ViewController.cs - diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Info.plist b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Info.plist index 09e9f7453..17f8a76e7 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Info.plist +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Info.plist @@ -7,9 +7,9 @@ CFBundleIdentifier com.microsoft.appcenter.Contoso-Forms-Demo-MacOS CFBundleShortVersionString - 5.0.0 + 5.0.2 CFBundleVersion - 5.0.0 + 5.0.2 LSMinimumSystemVersion 10.14 CFBundleDevelopmentRegion diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/AppConfiguration.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/AppConfiguration.cs deleted file mode 100644 index 9d84ebcaf..000000000 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/AppConfiguration.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Contoso.Forms.Demo.UWP; -using System; -using Xamarin.Forms; - -[assembly: Dependency(typeof(AppConfiguration))] -namespace Contoso.Forms.Demo.UWP -{ - class AppConfiguration: IAppConfiguration - { - public string GetAppSecret() - { - return Environment.GetEnvironmentVariable("XAMARIN_FORMS_UWP_PROD"); - } - - public string GetTargetToken() - { - return ""; - } - } -} 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 3ad82f34d..08742930b 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 @@ -93,7 +93,6 @@ App.xaml - @@ -136,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 ecfeed82d..a4d9fef8b 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 96f815101..2a6351063 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("5.0.0.0")] +[assembly: AssemblyFileVersion("5.0.2.0")] [assembly: ComVisible(false)] diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs index e15afe450..f66591ac7 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs @@ -14,7 +14,7 @@ namespace Contoso.Forms.Demo.iOS { [Register("AppDelegate")] - public class AppDelegate : Xamarin.Forms.Platform.iOS.FormsApplicationDelegate, IClearCrashClick, IAppConfiguration + public class AppDelegate : Xamarin.Forms.Platform.iOS.FormsApplicationDelegate, IClearCrashClick { private const string CrashesUserConfirmationStorageKey = "MSAppCenterCrashesUserConfirmation"; @@ -38,16 +38,6 @@ public void ClearCrashButton() { NSUserDefaults.StandardUserDefaults.RemoveObject(CrashesUserConfirmationStorageKey); } - - public string GetAppSecret() - { - return Environment.GetEnvironmentVariable("XAMARIN_FORMS_IOS_PROD"); - } - - public string GetTargetToken() - { - return Environment.GetEnvironmentVariable("XAMARIN_FORMS_IOS_TARGET_TOKEN_PROD"); - } } public class AnalyticsDelegate : MSACAnalyticsDelegate 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 88dc072a0..65eea3b2c 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 @@ -18,7 +18,7 @@ DEBUG;ENABLE_TEST_CLOUD; prompt 4 - iPhone Distribution: Microsoft Corporation + iPhone Developer: Microsoft Corporation true true None @@ -36,11 +36,11 @@ prompt 4 - iPhone Distribution: Microsoft Corporation + iPhone Developer: Microsoft Corporation true Entitlements-release.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler Default appcenter xamarin forms ios demo df Dist @@ -53,7 +53,7 @@ prompt 4 - iPhone Distribution: Microsoft Corporation + iPhone Developer: Microsoft Corporation None i386, x86_64 HttpClientHandler @@ -68,24 +68,18 @@ DEBUG;ENABLE_TEST_CLOUD; prompt 4 - iPhone Distribution: Microsoft Corporation + iPhone Developer: Microsoft Corporation true true false true Entitlements-debug.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler Default appcenter xamarin forms ios demo df Dist - - - - - - @@ -93,10 +87,10 @@ - - - - + + + + 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 aa191ef0c..8b1bd1d1b 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 - 5.0.0 + 5.0.2 LSRequiresIPhoneOS MinimumOSVersion @@ -39,7 +39,7 @@ CFBundleName ACFDemo CFBundleShortVersionString - 5.0.0 + 5.0.2 CFBundleURLTypes diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs index 38d11a261..1078f1e11 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs @@ -109,12 +109,18 @@ protected override void OnStart() private string GetOneCollectorTokenString() { - return DependencyService.Get().GetTargetToken(); + return "iosTarget={XAMARIN_FORMS_IOS_TARGET_TOKEN_PROD};" + + "macos={XAMARIN_FORMS_MACOS_TARGET_TOKEN_PROD};" + + "androidTarget={XAMARIN_FORMS_ANDROID_TARGET_TOKEN_PROD};" + + "uwp={XAMARIN_FORMS_UWP_TARGET_TOKEN_PROD}"; } private string GetAppCenterTokenString() { - return DependencyService.Get().GetAppSecret(); + return "ios={XAMARIN_FORMS_IOS_PROD};" + + "macos={XAMARIN_FORMS_MACOS_PROD};" + + "android={XAMARIN_FORMS_ANDROID_PROD};" + + "uwp={XAMARIN_FORMS_UWP_PROD}"; } private string GetTokensString() 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 808829f71..c288b9169 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,9 +4,9 @@ netstandard2.0 Microsoft Corp. All rights reserved. Microsoft Corporation - 5.0.0 + 5.0.2 0.0.0.0 - 5.0.0.0 + 5.0.2.0 Debug;Release;GooglePlay @@ -20,15 +20,15 @@ false - + - + - - - + + + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/IAppConfiguration.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/IAppConfiguration.cs deleted file mode 100644 index b6722d277..000000000 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/IAppConfiguration.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -namespace Contoso.Forms.Demo -{ - public interface IAppConfiguration - { - string GetAppSecret(); - string GetTargetToken(); - } -} 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 3f7347a5c..62d764461 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 @@ - + \ No newline at end of file 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 e7c50f063..866c6c7ee 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("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-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.MacOS/Info.plist b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.MacOS/Info.plist index 779af603b..dd1161a72 100644 --- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.MacOS/Info.plist +++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.MacOS/Info.plist @@ -7,9 +7,9 @@ CFBundleIdentifier com.microsoft.appcenter.Contoso-Forms-Puppet-MacOS CFBundleShortVersionString - 5.0.1 + 5.0.2 CFBundleVersion - 5.0.1 + 5.0.2 LSMinimumSystemVersion 10.14 CFBundleDevelopmentRegion 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 25c4a1446..e0b45b3e8 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 d626222fc..8bcccc33f 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("5.0.1.0")] +[assembly: AssemblyFileVersion("5.0.2.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 a6125b566..ed031f6f1 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 - 5.0.1 + 5.0.2 CFBundleVersion - 5.0.1 + 5.0.2 LSRequiresIPhoneOS MinimumOSVersion 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 19e0586c1..8ea0417c4 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("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-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.MAUI.Demo/App.xaml.cs b/Apps/Contoso.MAUI.Demo/App.xaml.cs index 54392aa90..a1694e441 100644 --- a/Apps/Contoso.MAUI.Demo/App.xaml.cs +++ b/Apps/Contoso.MAUI.Demo/App.xaml.cs @@ -116,7 +116,7 @@ private string GetAppCenterTokenString() { return "ios={MAUI_IOS_PROD};" + "android={MAUI_ANDROID_PROD};" + - $"windows={Environment.GetEnvironmentVariable("MAUI_WINDOWS_PROD")}"; + $"uwp={Environment.GetEnvironmentVariable("MAUI_WINDOWS_PROD")}"; } private string GetTokensString() diff --git a/Apps/Contoso.MAUI.Demo/Contoso.MAUI.Demo.csproj b/Apps/Contoso.MAUI.Demo/Contoso.MAUI.Demo.csproj index cbfe6b3a0..3bc28db53 100644 --- a/Apps/Contoso.MAUI.Demo/Contoso.MAUI.Demo.csproj +++ b/Apps/Contoso.MAUI.Demo/Contoso.MAUI.Demo.csproj @@ -1,4 +1,5 @@ - + + net6.0-android;net6.0-ios;net6.0-maccatalyst $(TargetFrameworks);net6.0-windows10.0.19041.0 @@ -8,7 +9,7 @@ true true enable - 5.0.0 + 5.0.2 Contoso.MAUI.Demo @@ -55,13 +56,13 @@ - - + + - + - + \ No newline at end of file diff --git a/Apps/Contoso.MAUI.Demo/Platforms/Windows/Package.appxmanifest b/Apps/Contoso.MAUI.Demo/Platforms/Windows/Package.appxmanifest index 50178e602..eed007767 100644 --- a/Apps/Contoso.MAUI.Demo/Platforms/Windows/Package.appxmanifest +++ b/Apps/Contoso.MAUI.Demo/Platforms/Windows/Package.appxmanifest @@ -5,7 +5,7 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap"> - + $placeholder$ diff --git a/Apps/Contoso.MacOS.Puppet/Info.plist b/Apps/Contoso.MacOS.Puppet/Info.plist index 3ec679733..3e9e1282c 100644 --- a/Apps/Contoso.MacOS.Puppet/Info.plist +++ b/Apps/Contoso.MacOS.Puppet/Info.plist @@ -13,11 +13,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.0.1 + 5.0.2 CFBundleSignature ???? CFBundleVersion - 5.0.1 + 5.0.2 LSMinimumSystemVersion 10.15 NSHumanReadableCopyright diff --git a/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj b/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj index 39be7a43c..178d1d822 100644 --- a/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj +++ b/Apps/Contoso.UWP.Demo/Contoso.UWP.Demo.csproj @@ -149,8 +149,8 @@ - - + + diff --git a/Apps/Contoso.UWP.Demo/Package.appxmanifest b/Apps/Contoso.UWP.Demo/Package.appxmanifest index e2e7598c4..98c2e047e 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 620db8dee..748ea4696 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("5.0.0.0")] +[assembly: AssemblyFileVersion("5.0.2.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 ce0ca6a66..d1785ba12 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 bd6cef57e..063401578 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("5.0.1.0")] +[assembly: AssemblyFileVersion("5.0.2.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 f9d7a66e9..616e14090 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.1 true - 5.0.0 + 5.0.2 0.0.0.0 - 5.0.0.0 + 5.0.2.0 - - + + diff --git a/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj index ac5796f10..30113c1bb 100644 --- a/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj +++ b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj @@ -115,8 +115,8 @@ - - + + diff --git a/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs b/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs index c90c1b8d1..8e6031d21 100644 --- a/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.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")] diff --git a/Apps/Contoso.WPF.Puppet.DotNetCore/Contoso.WPF.Puppet.DotNetCore.csproj b/Apps/Contoso.WPF.Puppet.DotNetCore/Contoso.WPF.Puppet.DotNetCore.csproj index 72e8732b2..66281f3b6 100644 --- a/Apps/Contoso.WPF.Puppet.DotNetCore/Contoso.WPF.Puppet.DotNetCore.csproj +++ b/Apps/Contoso.WPF.Puppet.DotNetCore/Contoso.WPF.Puppet.DotNetCore.csproj @@ -4,9 +4,9 @@ WinExe netcoreapp3.1 true - 5.0.1-SNAPSHOT + 5.0.2-SNAPSHOT 0.0.0.0 - 5.0.1.0 + 5.0.2.0 diff --git a/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs index 818e6e5f9..d939dfc07 100644 --- a/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs @@ -30,5 +30,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")] diff --git a/Apps/Contoso.WinForms.Demo.DotNetCore/Contoso.WinForms.Demo.DotNetCore.csproj b/Apps/Contoso.WinForms.Demo.DotNetCore/Contoso.WinForms.Demo.DotNetCore.csproj index 8a7a2444d..6bc7aa2cb 100644 --- a/Apps/Contoso.WinForms.Demo.DotNetCore/Contoso.WinForms.Demo.DotNetCore.csproj +++ b/Apps/Contoso.WinForms.Demo.DotNetCore/Contoso.WinForms.Demo.DotNetCore.csproj @@ -4,11 +4,11 @@ WinExe netcoreapp3.1 true - 5.0.0 + 5.0.2 - - + + diff --git a/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj index 4d2f8d747..2ccfe7c9c 100644 --- a/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj +++ b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj @@ -81,8 +81,8 @@ - - + + diff --git a/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs b/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs index 9ea34c42f..420cd8399 100644 --- a/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.WinForms.Demo/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("5.0.0.0")] -[assembly: AssemblyInformationalVersion("5.0.0")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2")] diff --git a/Apps/Contoso.WinForms.Puppet.DotNetCore/Contoso.WinForms.Puppet.DotNetCore.csproj b/Apps/Contoso.WinForms.Puppet.DotNetCore/Contoso.WinForms.Puppet.DotNetCore.csproj index f6f37e035..8fdcb6ad8 100644 --- a/Apps/Contoso.WinForms.Puppet.DotNetCore/Contoso.WinForms.Puppet.DotNetCore.csproj +++ b/Apps/Contoso.WinForms.Puppet.DotNetCore/Contoso.WinForms.Puppet.DotNetCore.csproj @@ -4,7 +4,7 @@ WinExe netcoreapp3.1 true - 5.0.1-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs index 8fceb267b..fdab0a337 100644 --- a/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.WinForms.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("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-SNAPSHOT")] diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo (Package)/Package.appxmanifest b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo (Package)/Package.appxmanifest index 721adca7d..190460f9a 100644 --- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo (Package)/Package.appxmanifest +++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo (Package)/Package.appxmanifest @@ -9,7 +9,7 @@ + Version="5.0.2.0" /> Contoso.WinUI.Desktop.Demo (Package) diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo.csproj b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo.csproj index f2958ce32..4064170b4 100644 --- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo.csproj +++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet (Package)/Package.appxmanifest b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet (Package)/Package.appxmanifest index 844d19bf1..93a88d6db 100644 --- a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet (Package)/Package.appxmanifest +++ b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet (Package)/Package.appxmanifest @@ -9,7 +9,7 @@ + Version="5.0.2.0" /> Contoso.WinUI.Desktop.Puppet (Package) diff --git a/Apps/Contoso.iOS.Puppet/Contoso.iOS.Puppet.csproj b/Apps/Contoso.iOS.Puppet/Contoso.iOS.Puppet.csproj index 652a87881..429433b00 100644 --- a/Apps/Contoso.iOS.Puppet/Contoso.iOS.Puppet.csproj +++ b/Apps/Contoso.iOS.Puppet/Contoso.iOS.Puppet.csproj @@ -91,7 +91,7 @@ - ..\..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll diff --git a/Apps/Contoso.iOS.Puppet/Info.plist b/Apps/Contoso.iOS.Puppet/Info.plist index a41d225ad..31b79e389 100644 --- a/Apps/Contoso.iOS.Puppet/Info.plist +++ b/Apps/Contoso.iOS.Puppet/Info.plist @@ -7,9 +7,9 @@ CFBundleIdentifier com.microsoft.appcenter.xamarin.ios.puppet CFBundleShortVersionString - 5.0.1 + 5.0.2 CFBundleVersion - 5.0.1 + 5.0.2 LSRequiresIPhoneOS MinimumOSVersion diff --git a/Apps/Contoso.iOS.Puppet/packages.config b/Apps/Contoso.iOS.Puppet/packages.config index 6298fadc4..9d0ad5de6 100644 --- a/Apps/Contoso.iOS.Puppet/packages.config +++ b/Apps/Contoso.iOS.Puppet/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e36ff969f..c61b44106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # App Center SDK for .NET Change Log +## Version 5.0.2 + +### App Center + +* **[Fix]** Update `Newtonsoft.Json` dependency to version `13.0.2`. The update fixes [GHSA-5crp-9r3c-p9vr](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). +* **[Fix]** Use `DispatcherUnhandledException` instead of `AppDomain.CurrentDomain.UnhandledException` for WPF applications for postcrash processing. It fixes #1727. +* **[Improvement]** Remove SmartLink=false, as it may break the SDK integration in some cases. +* **[Improvement]** Remove flag RegexOptions.Compiled, as it is proved to be slow on net6 and above. + +#### Windows + +* **[Fix]** Fix WindowsHelper's OSVersion check for Windows 7 sp1 + +___ + +## Version 5.0.1 + +### App Center + +* **[Fix]** Fix strong name validation. + +___ + ## Version 5.0.0 ### App Center diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs index 4e80de3ed..574373cad 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs +++ b/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs @@ -20,11 +20,7 @@ public partial class AppCenter const string AppSecretKeyName = "appsecret"; const string SecretsPattern = @"([^;=]+)=([^;]+)(?:;\s*)?"; -#if NETSTANDARD static readonly Regex _secretsRegex = new Regex(SecretsPattern); -#else - static readonly Regex _secretsRegex = new Regex(SecretsPattern, RegexOptions.Compiled); -#endif // Gets the first instance of an app sceret and/or target token corresponding to the given platform name, or returns the string // as-is if no identifier can be found. Logs a message if no identifiers can be found. diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs index 809be8a5b..0100f91ee 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs +++ b/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs @@ -14,6 +14,6 @@ public partial class WrapperSdk public const string Name = "appcenter.xamarin"; /* We can't use reflection for assemblyInformationalVersion on iOS with "Link All" optimization. */ - internal const string Version = "5.0.1-SNAPSHOT"; + internal const string Version = "5.0.2-SNAPSHOT"; } } diff --git a/SDK/AppCenter/Microsoft.AppCenter.UWP/Microsoft.AppCenter.UWP.csproj b/SDK/AppCenter/Microsoft.AppCenter.UWP/Microsoft.AppCenter.UWP.csproj index a3780de41..376b14dd0 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.UWP/Microsoft.AppCenter.UWP.csproj +++ b/SDK/AppCenter/Microsoft.AppCenter.UWP/Microsoft.AppCenter.UWP.csproj @@ -11,7 +11,7 @@ 10.0.16299.0 - + diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj index cde904d6f..0fcddc661 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj +++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj @@ -5,7 +5,7 @@ true - + diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/ApplicationLifecycleHelperDesktop.cs b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/ApplicationLifecycleHelperDesktop.cs index 14e4e507f..b900fe12d 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/ApplicationLifecycleHelperDesktop.cs +++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/ApplicationLifecycleHelperDesktop.cs @@ -42,10 +42,27 @@ static ApplicationLifecycleHelperDesktop() public ApplicationLifecycleHelperDesktop() { - AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) => + if (WindowsHelper.IsRunningAsWpf) { - InvokeUnhandledExceptionOccurred(sender, new UnhandledExceptionOccurredEventArgs((Exception)eventArgs.ExceptionObject)); - }; + var eventInfo = WindowsHelper.WpfApplication.GetType().GetEvent("DispatcherUnhandledException"); + + EventHandler eventHandler = (sender, eventArgs) => + { + var exceptionProperty = eventArgs.GetType().GetProperty("Exception"); + var exception = (Exception)exceptionProperty.GetValue(eventArgs); + InvokeUnhandledExceptionOccurred(sender, new UnhandledExceptionOccurredEventArgs(exception)); + }; + + var runtimeDelegate = Delegate.CreateDelegate(eventInfo.EventHandlerType, eventHandler.Target, eventHandler.Method); + eventInfo.AddEventHandler(WindowsHelper.WpfApplication, runtimeDelegate); + } + else + { + AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) => + { + InvokeUnhandledExceptionOccurred(sender, new UnhandledExceptionOccurredEventArgs((Exception)eventArgs.ExceptionObject)); + }; + } } } } diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/WindowsHelper.cs b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/WindowsHelper.cs index 17188c3d3..712ab2a87 100644 --- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/WindowsHelper.cs +++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Utils/WindowsHelper.cs @@ -23,6 +23,8 @@ public static class WindowsHelper public static bool IsRunningAsWinUI { get; } + public static dynamic WpfApplication { get; } + #region IsRunningAsUwp const long APPMODEL_ERROR_NO_PACKAGE = 15700L; @@ -32,7 +34,7 @@ public static class WindowsHelper private static bool _IsRunningAsUwp() { - if (Environment.OSVersion.Version <= new Version(6, 1)) + if (Environment.OSVersion.Version < new Version(6, 2)) { return false; } @@ -127,8 +129,6 @@ static WindowsHelper() IsRunningAsWinUI = IsRunningAsUwp || GetAssembly("System.Windows.Forms") == null; } - private static dynamic WpfApplication { get; } - // Store the int corresponding to the "Minimized" state for WPF Windows // This is equivalent to `System.Windows.WindowState.Minimized` private static readonly int Minimized; diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.Mono.csproj b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.Mono.csproj index dfeec41c6..9526f0c49 100644 --- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.Mono.csproj +++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.Mono.csproj @@ -25,7 +25,6 @@ True -lc++ True - False @@ -34,7 +33,6 @@ True -lc++ True - False diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj index 488670791..82b61ce85 100644 --- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj +++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj @@ -28,7 +28,6 @@ True -lc++ True - False @@ -37,7 +36,6 @@ True -lc++ True - False diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.Mono.csproj b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.Mono.csproj index 7fbc5caca..524ce6f55 100644 --- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.Mono.csproj +++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.Mono.csproj @@ -21,7 +21,6 @@ Static - False True SafariServices AuthenticationServices diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.csproj b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.csproj index cee71fda3..576df708f 100644 --- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.csproj +++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/Microsoft.AppCenter.Distribute.Apple.csproj @@ -20,7 +20,6 @@ Static - False True SafariServices AuthenticationServices diff --git a/SDK/Directory.Build.props b/SDK/Directory.Build.props index 3629ab0f2..631fbd46a 100644 --- a/SDK/Directory.Build.props +++ b/SDK/Directory.Build.props @@ -6,8 +6,8 @@ 7.0 - 5.0.1-SNAPSHOT - 5.0.1.0 + 5.0.2-SNAPSHOT + 5.0.2.0 0.0.0.0 diff --git a/Tests/Contoso.Test.Functional.Droid/Contoso.Test.Functional.Droid.csproj b/Tests/Contoso.Test.Functional.Droid/Contoso.Test.Functional.Droid.csproj index 7ab94fbcf..b99896a7b 100644 --- a/Tests/Contoso.Test.Functional.Droid/Contoso.Test.Functional.Droid.csproj +++ b/Tests/Contoso.Test.Functional.Droid/Contoso.Test.Functional.Droid.csproj @@ -119,7 +119,7 @@ - 13.0.1 + 13.0.2 2.4.2 diff --git a/Tests/Contoso.Test.Functional.Droid/Properties/AndroidManifest.xml b/Tests/Contoso.Test.Functional.Droid/Properties/AndroidManifest.xml index aada27494..4ef34a8f3 100644 --- a/Tests/Contoso.Test.Functional.Droid/Properties/AndroidManifest.xml +++ b/Tests/Contoso.Test.Functional.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Tests/Contoso.Test.Functional.Droid/Properties/AssemblyInfo.cs b/Tests/Contoso.Test.Functional.Droid/Properties/AssemblyInfo.cs index 075c52294..ae3df4669 100644 --- a/Tests/Contoso.Test.Functional.Droid/Properties/AssemblyInfo.cs +++ b/Tests/Contoso.Test.Functional.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("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-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/Tests/Contoso.Test.Functional.iOS/Contoso.Test.Functional.iOS.csproj b/Tests/Contoso.Test.Functional.iOS/Contoso.Test.Functional.iOS.csproj index 74bbac330..1c893366d 100644 --- a/Tests/Contoso.Test.Functional.iOS/Contoso.Test.Functional.iOS.csproj +++ b/Tests/Contoso.Test.Functional.iOS/Contoso.Test.Functional.iOS.csproj @@ -92,7 +92,7 @@ 2.5.25 - 13.0.1 + 13.0.2 diff --git a/Tests/Contoso.Test.Functional.iOS/Info.plist b/Tests/Contoso.Test.Functional.iOS/Info.plist index fc6927a00..923308755 100644 --- a/Tests/Contoso.Test.Functional.iOS/Info.plist +++ b/Tests/Contoso.Test.Functional.iOS/Info.plist @@ -7,9 +7,9 @@ CFBundleIdentifier com.contoso.test.functional CFBundleShortVersionString - 5.0.1 + 5.0.2 CFBundleVersion - 5.0.1 + 5.0.2 LSRequiresIPhoneOS MinimumOSVersion diff --git a/Tests/Contoso.Test.Functional.iOS/Properties/AssemblyInfo.cs b/Tests/Contoso.Test.Functional.iOS/Properties/AssemblyInfo.cs index 80f317be5..f640164cb 100644 --- a/Tests/Contoso.Test.Functional.iOS/Properties/AssemblyInfo.cs +++ b/Tests/Contoso.Test.Functional.iOS/Properties/AssemblyInfo.cs @@ -37,5 +37,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")] diff --git a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Microsoft.AppCenter.Analytics.Test.Windows.csproj b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Microsoft.AppCenter.Analytics.Test.Windows.csproj index 416ff20c9..b93b91314 100644 --- a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Microsoft.AppCenter.Analytics.Test.Windows.csproj +++ b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Microsoft.AppCenter.Analytics.Test.Windows.csproj @@ -71,7 +71,7 @@ 4.18.1 - 13.0.1 + 13.0.2 2.2.10 diff --git a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs index 39a79dd4c..b4233bb83 100644 --- a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs +++ b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs @@ -19,5 +19,5 @@ // [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")] diff --git a/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Microsoft.AppCenter.Crashes.Test.Windows.csproj b/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Microsoft.AppCenter.Crashes.Test.Windows.csproj index 3bfb7a2b0..0012df9ce 100644 --- a/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Microsoft.AppCenter.Crashes.Test.Windows.csproj +++ b/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Microsoft.AppCenter.Crashes.Test.Windows.csproj @@ -88,7 +88,7 @@ 4.18.1 - 13.0.1 + 13.0.2 2.2.10 diff --git a/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Properties/AssemblyInfo.cs index ead0094ed..7418db3b8 100644 --- a/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Properties/AssemblyInfo.cs +++ b/Tests/Microsoft.AppCenter.Crashes.Test.Windows/Properties/AssemblyInfo.cs @@ -19,5 +19,5 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] -[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")] \ No newline at end of file +[assembly: AssemblyFileVersion("5.0.2.0")] +[assembly: AssemblyInformationalVersion("5.0.2-SNAPSHOT")] \ No newline at end of file diff --git a/Tests/Microsoft.AppCenter.Test.Functional/Microsoft.AppCenter.Test.Functional.csproj b/Tests/Microsoft.AppCenter.Test.Functional/Microsoft.AppCenter.Test.Functional.csproj index 8627fec89..3a39a9b9b 100644 --- a/Tests/Microsoft.AppCenter.Test.Functional/Microsoft.AppCenter.Test.Functional.csproj +++ b/Tests/Microsoft.AppCenter.Test.Functional/Microsoft.AppCenter.Test.Functional.csproj @@ -9,7 +9,7 @@ - + diff --git a/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest b/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest index 200629b4e..471f124f5 100644 --- a/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest +++ b/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest @@ -7,7 +7,7 @@ + Version="5.0.2.0" /> diff --git a/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs index 3c38e8f10..d235e4d60 100644 --- a/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs +++ b/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs @@ -17,5 +17,5 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] +[assembly: AssemblyFileVersion("5.0.2.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj b/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj index 91be168a4..595b5b9e2 100644 --- a/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj +++ b/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj @@ -111,7 +111,7 @@ 4.18.1 - 13.0.1 + 13.0.2 2.2.10 diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs index 650794b23..be24d2bce 100644 --- a/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs +++ b/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs @@ -19,5 +19,5 @@ // [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")] diff --git a/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs index f9956cb98..0f1a66b09 100644 --- a/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs +++ b/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs @@ -20,4 +20,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] +[assembly: AssemblyFileVersion("5.0.2.0")] diff --git a/Tests/Microsoft.AppCenter.Test/Microsoft.AppCenter.Test.csproj b/Tests/Microsoft.AppCenter.Test/Microsoft.AppCenter.Test.csproj index 5b12de4ba..4e629832c 100644 --- a/Tests/Microsoft.AppCenter.Test/Microsoft.AppCenter.Test.csproj +++ b/Tests/Microsoft.AppCenter.Test/Microsoft.AppCenter.Test.csproj @@ -10,7 +10,7 @@ ..\..\appcenter-public-key.snk - + diff --git a/cgmanifest.json b/cgmanifest.json index 23a6beaf1..d22fc47da 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "type": "git", "git": { "repositoryUrl": "https://github.com/microsoft/appcenter-sdk-android.git", - "commitHash": "c53920a71178100ad6658ff3f23528ee4c501462" + "commitHash": "9b183d6e6e71e3bb5d35a3ac34b59b448dd82797" } } }, @@ -15,7 +15,7 @@ "type": "git", "git": { "repositoryUrl": "https://github.com/microsoft/appcenter-sdk-apple.git", - "commitHash": "88e65475ffd3a7cf2bbde07df9e62159a1fd60a8" + "commitHash": "f2bcbd9eba88e32d2de9ce9512c4c47eabbf27ca" } } } diff --git a/nuget/AppCenter.nuspec b/nuget/AppCenter.nuspec index 57e9d4869..e78d2f560 100644 --- a/nuget/AppCenter.nuspec +++ b/nuget/AppCenter.nuspec @@ -17,25 +17,25 @@ - + - + - + - + - + diff --git a/nuget/WindowsAppCenter.nuspec b/nuget/WindowsAppCenter.nuspec index 2d6163371..47e305ee2 100644 --- a/nuget/WindowsAppCenter.nuspec +++ b/nuget/WindowsAppCenter.nuspec @@ -17,25 +17,25 @@ - + - + - + - + - + diff --git a/scripts/configuration/ac-build-config.xml b/scripts/configuration/ac-build-config.xml index d43416b38..9f3a3acfd 100644 --- a/scripts/configuration/ac-build-config.xml +++ b/scripts/configuration/ac-build-config.xml @@ -1,9 +1,9 @@ - 5.0.1-SNAPSHOT - 5.0.0 - 5.0.0 + 5.0.2-SNAPSHOT + 5.0.2 + 5.0.1 diff --git a/scripts/run-ios-functional-tests.sh b/scripts/run-ios-functional-tests.sh index ae497a442..63f1fc1f2 100755 --- a/scripts/run-ios-functional-tests.sh +++ b/scripts/run-ios-functional-tests.sh @@ -44,4 +44,4 @@ done xcrun simctl shutdown "${IOS_DEVICE}" # Exit with test result code (0 for success, non 0 for failure) -xmllint --xpath "//*[local-name()='Counters'][@failed = 0]" results.xml > /dev/null 2>&1 +xmllint --xpath "//*[local-name()='Counters'][@failed = 0]" results.xml > /dev/null 2>&1 \ No newline at end of file diff --git a/scripts/update-app-secrets.sh b/scripts/update-app-secrets.sh index 9c981e68a..bab1001d6 100755 --- a/scripts/update-app-secrets.sh +++ b/scripts/update-app-secrets.sh @@ -30,14 +30,12 @@ declare -a platformConstants=( # Files which should be changed. declare -a targetFiles=("Apps/Contoso.Android.Puppet/Contoso.Android.Puppet.csproj" - "Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj" - "Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.MacOS/Contoso.Forms.Demo.MacOS.csproj" - "Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj" "Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj" "Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.MacOS/Contoso.Forms.Puppet.MacOS.csproj" "Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Contoso.Forms.Puppet.iOS.csproj" "Apps/Contoso.MacOS.Puppet/Contoso.MacOS.Puppet.csproj" "Apps/Contoso.iOS.Puppet/Contoso.iOS.Puppet.csproj" + "Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs" "Apps/Contoso.MAUI.Demo/App.xaml.cs") # Print info about current job. diff --git a/scripts/utility.cake b/scripts/utility.cake index a7bf3f7a2..5c86ab66a 100644 --- a/scripts/utility.cake +++ b/scripts/utility.cake @@ -5,7 +5,7 @@ // Static variables defined outside of a class can cause issues. -#addin nuget:?package=Newtonsoft.Json&version=13.0.1 +#addin nuget:?package=Newtonsoft.Json&version=13.0.2 using Newtonsoft.Json.Linq; diff --git a/test-tools.cake b/test-tools.cake index f3bbc0b5d..db68649ea 100644 --- a/test-tools.cake +++ b/test-tools.cake @@ -3,7 +3,7 @@ #addin nuget:?package=Cake.Xamarin&version=4.0.0 #addin nuget:?package=Cake.FileHelpers&version=5.0.0 -#addin nuget:?package=Newtonsoft.Json&version=13.0.1 +#addin nuget:?package=Newtonsoft.Json&version=13.0.2 using System; using System.Collections.Generic;