Skip to content

Commit

Permalink
SPMeta2 1.2.1 release, August 2015 (.NET 40 build fix)
Browse files Browse the repository at this point in the history
  • Loading branch information
SubPointSupport committed Aug 24, 2015
1 parent 53730be commit 8fe0426
Show file tree
Hide file tree
Showing 21 changed files with 48 additions and 23 deletions.
3 changes: 2 additions & 1 deletion SPMeta2.sln
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ EndProject
Global
GlobalSection(AutomaticVersions) = postSolution
UpdateAssemblyVersion = False
UpdateAssemblyFileVersion = False
UpdateAssemblyFileVersion = True
UpdateAssemblyInfoVersion = False
AssemblyFileVersionSettings = None.None.DateStamp.TimeStamp
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212|Any CPU = 1212|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
30 changes: 27 additions & 3 deletions SPMeta2/SPMeta2.CSOM/ModelHandlers/AppModelHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using SPMeta2.Definitions;
using SPMeta2.Services;
using SPMeta2.Utils;
using System.Reflection;

namespace SPMeta2.CSOM.ModelHandlers
{
Expand Down Expand Up @@ -232,12 +233,35 @@ private void DeployApp(object modelHost, WebModelHost webHost, AppDefinition app
/// <returns></returns>
protected virtual bool IsAppUpgradeException(Exception upgradeException)
{
if (upgradeException == null)
return false;

// Microsoft.SharePoint.Client.ServerException]
// {"An App Instance can only be upgraded to a newer version of the same product. The upgrade request was for product 1.0.0.3 version e81b6820-5d57-4d17-a098-5f4317f6c400 to product 1.0.0.0 version e81b6820-5d57-4d17-a098-5f4317f6c400."}

return upgradeException != null
&& upgradeException is ServerException
&& upgradeException.HResult == -2146233088;

if (upgradeException is ServerException)
{
// .net 4 hack to get HResult
var hResultProp = upgradeException.GetType()
.GetProperty("HResult",
BindingFlags.NonPublic
| BindingFlags.Public
| BindingFlags.Instance
| BindingFlags.Static);


if (hResultProp != null)
{
var hResultValue = hResultProp.GetValue(upgradeException, null);
if (hResultValue is int)
{
return (int)hResultValue == -2146233088;
}
}
}

return false;
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Standard/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15236.1304")]
[assembly: AssemblyFileVersion("1.2.15236.1334")]

0 comments on commit 8fe0426

Please sign in to comment.