Skip to content

Commit

Permalink
Merge pull request #1708 from microsoft/release/5.0.1
Browse files Browse the repository at this point in the history
Start new 5.0.1 version
  • Loading branch information
DmitriyKirakosyan authored Dec 2, 2022
2 parents 6c769cc + 9f7fe23 commit 86cf6e7
Show file tree
Hide file tree
Showing 32 changed files with 54 additions and 57 deletions.
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="110" android:versionName="5.0.0-SNAPSHOT" android:installLocation="auto">
<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">
<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.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
using AppKit;
using Foundation;
using Xamarin.Forms.Platform.MacOS;
using Xamarin.Forms;
using Contoso.Forms.Demo.MacOS;

[assembly: Dependency(typeof(AppDelegate))]
namespace Contoso.Forms.Demo.MacOS
{
[Register("AppDelegate")]
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" android:versionCode="111" android:versionName="5.0.0-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="112" android:versionName="5.0.1-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="ACFPuppet"></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("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-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.
Expand Down
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-Puppet-MacOS</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CFBundleDevelopmentRegion</key>
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.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.0.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.1.0" />
<mp:PhoneIdentity PhoneProductId="55497ed8-b2ac-4485-ba79-e2b65bb720ed" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.Forms.Puppet.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.1.0")]
[assembly: ComVisible(false)]
4 changes: 2 additions & 2 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.xamarin.forms.ios.puppet</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-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.
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.MacOS.Puppet/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.UWP.Puppet/Package.appxmanifest
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.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.0.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="5.0.1.0" />
<mp:PhoneIdentity PhoneProductId="ce1e8604-09a9-4ffb-846b-8762beb84188" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.UWP.Puppet</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
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.1.0")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<Version>5.0.0-SNAPSHOT</Version>
<Version>5.0.1-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>5.0.0.0</FileVersion>
<FileVersion>5.0.1.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<Version>5.0.0-SNAPSHOT</Version>
<Version>5.0.1-SNAPSHOT</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.WinForms.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.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="796335c7-b33b-483b-995f-fa87ae20db4f"
Publisher="CN=Microsoft.AppCenter"
Version="5.0.0.0" />
Version="5.0.1.0" />

<Properties>
<DisplayName>Contoso.WinUI.Desktop.Puppet (Package)</DisplayName>
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.iOS.Puppet/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.xamarin.ios.puppet</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-SNAPSHOT";
internal const string Version = "5.0.1-SNAPSHOT";
}
}
16 changes: 5 additions & 11 deletions SDK/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Copyright>Microsoft Corp. All rights reserved.</Copyright>
<Company>Microsoft Corporation</Company>

<!-- Pin C# version. C# 8 features might have issues on Mono runtime. -->
<!-- Pin C# version. C# 8 features might have issues on Mono runtime. -->
<LangVersion>7.0</LangVersion>

<!-- Current version. -->
<Version>5.0.0-SNAPSHOT</Version>
<FileVersion>5.0.0.0</FileVersion>

<Version>5.0.1-SNAPSHOT</Version>
<FileVersion>5.0.1.0</FileVersion>
<!-- Used in runtime to ensure versions match. Prevents loading in some cases, so don't set it as release version. -->
<AssemblyVersion>0.0.0.0</AssemblyVersion>

<!-- Fix to have multiple projects in the same folder. -->
<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<DefaultItemExcludes>$(DefaultItemExcludes);obj\**</DefaultItemExcludes>

<!-- Build XML documentation. -->
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

<!-- TODO: Fix XML documentation warnings. -->
<NoWarn>1573;1591</NoWarn>

<!-- Signing. -->
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\..\..\appcenter-public-key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
</Project>
</Project>
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" android:versionCode="42" android:versionName="5.0.0-SNAPSHOT" package="com.contoso.test.functional">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="43" android:versionName="5.0.1-SNAPSHOT" package="com.contoso.test.functional">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="Contoso.Test.Functional.Droid">
Expand Down
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("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-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.
Expand Down
4 changes: 2 additions & 2 deletions Tests/Contoso.Test.Functional.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>com.contoso.test.functional</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleVersion</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Contoso.Test.Functional.iOS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,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-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
2 changes: 1 addition & 1 deletion Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<Identity Name="da6d3d34-876e-488c-9342-7a7e4daa110b"
Publisher="CN=Alexander Chocron"
Version="5.0.0.0" />
Version="5.0.1.0" />

<mp:PhoneIdentity PhoneProductId="da6d3d34-876e-488c-9342-7a7e4daa110b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyInformationalVersion("5.0.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("5.0.1.0")]
[assembly: AssemblyInformationalVersion("5.0.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.0.1.0")]
2 changes: 1 addition & 1 deletion scripts/configuration/ac-build-config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<config>
<sdkInfo>
<sdkVersion>5.0.0-SNAPSHOT</sdkVersion>
<sdkVersion>5.0.1-SNAPSHOT</sdkVersion>
<appleVersion>5.0.0</appleVersion>
<androidVersion>5.0.0</androidVersion>
</sdkInfo>
Expand Down

0 comments on commit 86cf6e7

Please sign in to comment.