Skip to content

Commit

Permalink
1.2.25-beta2, October 2015, corrected build script, NET35
Browse files Browse the repository at this point in the history
  • Loading branch information
@SubPointSupport
SubPointSupport committed Oct 12, 2015
1 parent c5e3b7e commit 65b0631
Show file tree
Hide file tree
Showing 24 changed files with 27 additions and 27 deletions.
3 changes: 2 additions & 1 deletion SPMeta2.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,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
4 changes: 2 additions & 2 deletions SPMeta2/SPMeta2.Build/build.v12.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ if($includeV16Build -eq $true) {
}

# SSOM
& $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"
& $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:DefineConstants=NET40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"
& $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"

& $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"
& $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:DefineConstants=NET40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"
& $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0"
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers.Standard/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.CSOM.Standard/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.Impl.Tests/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.SSOM.Standard/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression.Tests/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Regression/Properties/AssemblyInfo.cs
View file
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.0.15285.1325")]
[assembly: AssemblyFileVersion("1.0.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
4 changes: 2 additions & 2 deletions SPMeta2/SPMeta2.SSOM/Extensions/WebPartExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static System.Web.UI.WebControls.WebParts.WebPart ResolveWebPartInstance(
{
if (xmlReader != null)
{
#if !NET35
#if !NET35 && !NET40
xmlReader.Dispose();
#endif
}
Expand Down Expand Up @@ -92,7 +92,7 @@ public static System.Web.UI.WebControls.WebParts.WebPart ResolveWebPartInstance(
{
if (xmlReader != null)
{
#if !NET35
#if !NET35 && !NET40
xmlReader.Dispose();
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2.Standard/Properties/AssemblyInfo.cs
View file
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.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
2 changes: 1 addition & 1 deletion SPMeta2/SPMeta2/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.15285.1325")]
[assembly: AssemblyFileVersion("1.2.15285.1337")]
3 changes: 1 addition & 2 deletions SPMeta2/SPMeta2/Services/HashCodeServiceBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public abstract class HashCodeServiceBase : IDisposable

public void Dispose()
{
// differnet method name due to .NET35
InternalDispose(true);
GC.SuppressFinalize(this);
}
Expand Down Expand Up @@ -63,7 +62,7 @@ protected override void InternalDispose(bool disposing)
if (_cryptoServiceProvider != null)

{
#if !NET35
#if !NET35
// OMG
_cryptoServiceProvider.Dispose();
#endif
Expand Down

0 comments on commit 65b0631

Please sign in to comment.