Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 116ece2

Browse files
SubPointSupportSubPointSupport
authored
Merge pull request #10 from SubPointSolutions/beta
beta1
2 parents 63fee03 + 0f07783 commit 116ece2

File tree

10 files changed

+236
-153
lines changed

10 files changed

+236
-153
lines changed

‎DefinitelyPacked.ArvoSys/DefinitelyPacked.ArvoSys.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,14 @@
3636
<HintPath>..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="MetaPack.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MetaPack.Core.1.2.100-alpha170491442\lib\net45\MetaPack.Core.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="MetaPack.Core">
40+
<HintPath>..\packages\MetaPack.Core.0.1.0-beta2\lib\net45\MetaPack.Core.dll</HintPath>
4241
</Reference>
43-
<Reference Include="MetaPack.NuGet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MetaPack.NuGet.1.2.100-alpha170491442\lib\net45\MetaPack.NuGet.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="MetaPack.NuGet">
43+
<HintPath>..\packages\MetaPack.NuGet.0.1.0-beta2\lib\net45\MetaPack.NuGet.dll</HintPath>
4644
</Reference>
47-
<Reference Include="MetaPack.SPMeta2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\MetaPack.SPMeta2.1.2.100-alpha170491442\lib\net45\MetaPack.SPMeta2.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="MetaPack.SPMeta2">
46+
<HintPath>..\packages\MetaPack.SPMeta2.0.1.0-beta2\lib\net45\MetaPack.SPMeta2.dll</HintPath>
5047
</Reference>
5148
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5249
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>

‎DefinitelyPacked.ArvoSys/Services/ArvoSysSolutionRepositoryService.cs‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Text;
45
using DefinitelyPacked.ArvoSys.Models;
6+
using MetaPack.Core.Common;
57
using MetaPack.Core.Packaging;
68
using MetaPack.Core.Services;
79
using MetaPack.SPMeta2;
@@ -37,6 +39,7 @@ public override IEnumerable<Stream> GetSolutionPackageStreams()
3739
package.Name = "spf-imagefield";
3840
package.Title = "spf-imagefield";
3941

42+
package.Description = "SharePoint Flow Image Field";
4043
package.ProjectUrl = "https://github.com/sergeisnitko/spf-imagefield";
4144

4245
}));
@@ -51,6 +54,7 @@ public override IEnumerable<Stream> GetSolutionPackageStreams()
5154
package.Name = "spf-fieldsettings";
5255
package.Title = "spf-fieldsettings";
5356

57+
package.Description = "Enables management of advances field properties such as JSLink and others";
5458
package.ProjectUrl = "https://github.com/sergeisnitko/spf-fieldsettings";
5559
}));
5660

@@ -64,6 +68,7 @@ public override IEnumerable<Stream> GetSolutionPackageStreams()
6468
package.Name = "spf-newitemcallout";
6569
package.Title = "spf-newitemcallout";
6670

71+
package.Description = "SharePoint custom callout for new item hero button";
6772
package.ProjectUrl = "https://github.com/sergeisnitko/spf-newitemcallout";
6873
}));
6974

@@ -73,21 +78,21 @@ public override IEnumerable<Stream> GetSolutionPackageStreams()
7378
protected virtual Stream CreateSPFFieldSettingsPackage(ModelNode model, Action<SolutionPackageBase> action)
7479
{
7580
// save solution to XML file
76-
var modelXml = SPMeta2Model.ToXML(model);
77-
78-
var tmpFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
79-
Directory.CreateDirectory(tmpFolder);
80-
81-
var modelFilePath = Path.Combine(tmpFolder, "model.xml");
82-
File.WriteAllText(modelFilePath, modelXml);
81+
var xmlContext = SPMeta2Model.ToXML(model);
8382

8483
// pack model
8584
var solutionPackage = GetSolutionPackageTemplate();
8685

8786
// update version and add model
8887
action(solutionPackage);
8988

90-
solutionPackage.ModelFolders.Add(Path.GetDirectoryName(modelFilePath));
89+
// create ModelContainerBase, put serialized model there
90+
var modelContainer = new ModelContainerBase
91+
{
92+
Model = Encoding.UTF8.GetBytes(xmlContext),
93+
};
94+
95+
solutionPackage.AddModel(modelContainer);
9196

9297
// pack to NuGet package
9398
var packageService = new SPMeta2SolutionPackageService();
@@ -96,9 +101,9 @@ protected virtual Stream CreateSPFFieldSettingsPackage(ModelNode model, Action<S
96101
return solutionPackageStream;
97102
}
98103

99-
protected virtual SPMeta2SolutionPackage GetSolutionPackageTemplate()
104+
protected virtual SolutionPackageBase GetSolutionPackageTemplate()
100105
{
101-
var solutionPackage = new SPMeta2SolutionPackage();
106+
var solutionPackage = new SolutionPackageBase();
102107

103108
solutionPackage.Description = "SharePoint Flow Image Field. The SharePoint CSR UI control for working with pictures/images in field (upload, select from library)";
104109

@@ -116,6 +121,13 @@ protected virtual SPMeta2SolutionPackage GetSolutionPackageTemplate()
116121
solutionPackage.Copyright = string.Empty;
117122
solutionPackage.Tags = "SharePoint SP2013 Foundation Standard Enterprise SPO SharePointOnline O365 Office365 Office365Dev Provision SPMeta2 ARVO SPF SPFlow JavaScript CSR Client-Side Rendering";
118123

124+
// flag a provider which will be used for solution package deployment
125+
solutionPackage.AdditionalOptions.Add(new OptionValue
126+
{
127+
Name = DefaultOptions.SolutionToolPackage.PackageId.Id,
128+
Value = "MetaPack.SPMeta2"
129+
});
130+
119131
return solutionPackage;
120132
}
121133

‎DefinitelyPacked.ArvoSys/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net45" />
4-
<package id="MetaPack.Core" version="1.2.100-alpha170491442" targetFramework="net45" />
5-
<package id="MetaPack.NuGet" version="1.2.100-alpha170491442" targetFramework="net45" />
6-
<package id="MetaPack.SPMeta2" version="1.2.100-alpha170491442" targetFramework="net45" />
4+
<package id="MetaPack.Core" version="0.1.0-beta2" targetFramework="net45" />
5+
<package id="MetaPack.NuGet" version="0.1.0-beta2" targetFramework="net45" />
6+
<package id="MetaPack.SPMeta2" version="0.1.0-beta2" targetFramework="net45" />
77
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
88
<package id="NuGet.Core" version="2.12.0" targetFramework="net45" />
99
<package id="SPMeta2.Core" version="1.2.95-beta1" targetFramework="net45" />

‎DefinitelyPacked.Tests/Scenarios/DefinitelyPackedTests.cs‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,31 @@ private void UpdateReadmeFile(List<IPackage> packages)
7979
{
8080
var packagesListString = new StringBuilder();
8181

82-
foreach (var packageKey in packages.GroupBy(p => p.Id))
82+
packagesListString.AppendFormat("| Package | Description | {0}", Environment.NewLine);
83+
packagesListString.AppendFormat("| ------------- | ------------- |{0}", Environment.NewLine);
84+
85+
foreach (var packageKey in packages.OrderBy(p => p.Id).GroupBy(p => p.Id))
8386
{
8487
var packageId = packageKey.Key;
8588

86-
packagesListString.AppendFormat("{0}{1}", packageId, Environment.NewLine);
89+
//packagesListString.AppendFormat("{0}{1}", packageId, Environment.NewLine);
8790

88-
foreach (var package in packageKey.OrderByDescending(p => p.Version))
89-
packagesListString.AppendFormat("* {0}{1}", package.Version, Environment.NewLine);
91+
//foreach (var package in packageKey.OrderByDescending(p => p.Version))
92+
// packagesListString.AppendFormat("* {0}{1}", package.Version, Environment.NewLine);
9093

91-
packagesListString.AppendFormat("{0}",Environment.NewLine);
92-
packagesListString.AppendFormat("{0}", Environment.NewLine);
94+
//packagesListString.AppendFormat("{0}",Environment.NewLine);
95+
//packagesListString.AppendFormat("{0}", Environment.NewLine);
96+
97+
foreach (var package in packageKey.OrderByDescending(p => p.Version))
98+
{
99+
packagesListString.AppendFormat("| {0} | {1} |{2}",
100+
string.Format("[{0}]({1})", package.Id, package.ProjectUrl),
101+
//package.Version,
102+
package.Description,
103+
Environment.NewLine);
104+
105+
break;
106+
}
93107
}
94108

95109
var fileContent = File.ReadAllText(ReadmeTemplateFilePath);

‎DefinitelyPacked.Tests/packages.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net45" />
4-
<package id="MetaPack.Core" version="1.2.100-alpha170491442" targetFramework="net45" />
5-
<package id="MetaPack.NuGet" version="1.2.100-alpha170491442" targetFramework="net45" />
4+
<package id="MetaPack.Core" version="0.1.0-beta2" targetFramework="net45" />
5+
<package id="MetaPack.NuGet" version="0.1.0-beta2" targetFramework="net45" />
6+
<package id="MetaPack.SPMeta2" version="0.1.0-beta2" targetFramework="net45" />
67
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
78
<package id="NuGet.Core" version="2.12.0" targetFramework="net45" />
8-
<package id="SPMeta2.Core" version="1.2.100" targetFramework="net45" />
9+
<package id="SPMeta2.Core" version="1.2.95-beta1" targetFramework="net45" />
910
</packages>

‎DefinitelyPacked.jQuery/DefinitelyPacked.jQuery.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,14 @@
3636
<HintPath>..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="MetaPack.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MetaPack.Core.1.2.100-alpha170491442\lib\net45\MetaPack.Core.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="MetaPack.Core">
40+
<HintPath>..\packages\MetaPack.Core.0.1.0-beta2\lib\net45\MetaPack.Core.dll</HintPath>
4241
</Reference>
43-
<Reference Include="MetaPack.NuGet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MetaPack.NuGet.1.2.100-alpha170491442\lib\net45\MetaPack.NuGet.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="MetaPack.NuGet">
43+
<HintPath>..\packages\MetaPack.NuGet.0.1.0-beta2\lib\net45\MetaPack.NuGet.dll</HintPath>
4644
</Reference>
47-
<Reference Include="MetaPack.SPMeta2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\MetaPack.SPMeta2.1.2.100-alpha170491442\lib\net45\MetaPack.SPMeta2.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="MetaPack.SPMeta2">
46+
<HintPath>..\packages\MetaPack.SPMeta2.0.1.0-beta2\lib\net45\MetaPack.SPMeta2.dll</HintPath>
5047
</Reference>
5148
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5249
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>

‎DefinitelyPacked.jQuery/Services/jQuerySolutionRepositoryService.cs‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
using System.Linq;
55
using System.Text;
66
using System.Threading.Tasks;
7+
using MetaPack.Core.Common;
8+
using MetaPack.Core.Packaging;
79
using MetaPack.Core.Services;
810
using MetaPack.SPMeta2;
911
using MetaPack.SPMeta2.Services;
@@ -28,6 +30,12 @@ protected virtual IEnumerable<Stream> CreateMetaPackPackages()
2830
{
2931
var result = new List<Stream>();
3032

33+
// pack model
34+
var solutionPackage = GetSolutionPackageTemplate();
35+
36+
// update version and add model
37+
solutionPackage.Version = "0.1.0-beta1";
38+
3139
var assemblyDirectoryPath = Path.GetDirectoryName(GetType().Assembly.Location);
3240
var jQueryDirectoryPath = Path.Combine(assemblyDirectoryPath, "jQuery");
3341

@@ -40,7 +48,7 @@ protected virtual IEnumerable<Stream> CreateMetaPackPackages()
4048
{
4149
var jQueryVersion = Path.GetFileName(versionFolderPath);
4250

43-
var versionFolderName = (new DirectoryInfo(versionFolderPath)).Name;
51+
var versionFolderName = (new DirectoryInfo(versionFolderPath)).Name;
4452
var filePaths = Directory.GetFiles(versionFolderPath, "*.*");
4553

4654
// create model
@@ -66,35 +74,38 @@ protected virtual IEnumerable<Stream> CreateMetaPackPackages()
6674
});
6775

6876
// save solution to XML file
69-
var modelXml = SPMeta2Model.ToXML(webModel);
70-
71-
var tmpFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
72-
Directory.CreateDirectory(tmpFolder);
77+
var xmlContext = SPMeta2Model.ToXML(webModel);
7378

74-
var modelFilePath = Path.Combine(tmpFolder, "WebModel.jQuery.xml");
75-
File.WriteAllText(modelFilePath, modelXml);
7679

77-
// pack model
78-
var solutionPackage = GetSolutionPackageTemplate();
7980

80-
// update version and add model
81-
solutionPackage.Version = jQueryVersion;
82-
solutionPackage.ModelFolders.Add(Path.GetDirectoryName(modelFilePath));
81+
// create ModelContainerBase, put serialized model there
82+
var modelContainer = new ModelContainerBase
83+
{
84+
Model = Encoding.UTF8.GetBytes(xmlContext),
85+
};
8386

84-
// pack to NuGet package
85-
var packageService = new SPMeta2SolutionPackageService();
86-
var solutionPackageStream = packageService.Pack(solutionPackage);
87+
modelContainer.AdditionalOptions.Add(new OptionValue
88+
{
89+
Name = "_metapack.model.id",
90+
Value = string.Format("jQuery.{0}", jQueryVersion)
91+
});
8792

88-
// add to result strems
89-
result.Add(solutionPackageStream);
93+
solutionPackage.AddModel(modelContainer);
9094
}
9195

96+
// pack to NuGet package
97+
var packageService = new SPMeta2SolutionPackageService();
98+
var solutionPackageStream = packageService.Pack(solutionPackage);
99+
100+
// add to result strems
101+
result.Add(solutionPackageStream);
102+
92103
return result;
93104
}
94105

95-
private static SPMeta2SolutionPackage GetSolutionPackageTemplate()
106+
private static SolutionPackageBase GetSolutionPackageTemplate()
96107
{
97-
var solutionPackage = new SPMeta2SolutionPackage();
108+
var solutionPackage = new SolutionPackageBase();
98109

99110
solutionPackage.Name = "DefinitelyPacked.jQuery";
100111
solutionPackage.Title = "DefinitelyPacked.jQuery";
@@ -115,7 +126,12 @@ private static SPMeta2SolutionPackage GetSolutionPackageTemplate()
115126
solutionPackage.Copyright = string.Empty;
116127
solutionPackage.Tags = "jQuery SPMeta2 MetaPack DefinitelyPacked SharePoint Office365 Office365Dev SharePointOnline";
117128

118-
129+
// flag a provider which will be used for solution package deployment
130+
solutionPackage.AdditionalOptions.Add(new OptionValue
131+
{
132+
Name = DefaultOptions.SolutionToolPackage.PackageId.Id,
133+
Value = "MetaPack.SPMeta2"
134+
});
119135

120136
return solutionPackage;
121137
}

‎DefinitelyPacked.jQuery/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net45" />
4-
<package id="MetaPack.Core" version="1.2.100-alpha170491442" targetFramework="net45" />
5-
<package id="MetaPack.NuGet" version="1.2.100-alpha170491442" targetFramework="net45" />
6-
<package id="MetaPack.SPMeta2" version="1.2.100-alpha170491442" targetFramework="net45" />
4+
<package id="MetaPack.Core" version="0.1.0-beta2" targetFramework="net45" />
5+
<package id="MetaPack.NuGet" version="0.1.0-beta2" targetFramework="net45" />
6+
<package id="MetaPack.SPMeta2" version="0.1.0-beta2" targetFramework="net45" />
77
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
88
<package id="NuGet.Core" version="2.12.0" targetFramework="net45" />
99
<package id="SPMeta2.Core" version="1.2.95-beta1" targetFramework="net45" />

0 commit comments

Comments
 (0)