Merge branch 'Sprint/2020-16' into 'master'

Sprint/2020 16

See merge request coscine/cs/action!51

src/Action.Tests/Action.Tests.csproj

@@ -60,6 +60,12 @@
     <Reference Include="LinqKit, Version=1.1.17.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL">
       <HintPath>..\packages\LinqKit.1.1.17\lib\net45\LinqKit.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.SharePoint, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -72,6 +78,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
     <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/Action.Tests/ProjectActionTests.cs

@@ -28,7 +28,7 @@ namespace Action.Tests
             User owner = new User()
             {
                 // XXX: think about generating a random user id for testing, sharepoint actually should not care
-                Id = Guid.Parse("5d3d10f4-91be-4f1c-bdfe-eb2e5aa9be82")
+                Id = Guid.Parse("E419CC29-4883-4D1C-B716-DD0BBB694D63")
             };
 
             ProjectEventArgs eventArgs = new ProjectEventArgs(configuration)

src/Action.Tests/app.config

@@ -30,6 +30,14 @@
         <assemblyIdentity name="Coscine.Configuration" publicKeyToken="ce3d7a32d7dc1e5a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

src/Action.Tests/packages.config

@@ -8,7 +8,10 @@
   <package id="linq2db.SqlServer" version="2.6.4" targetFramework="net461" />
   <package id="linq2db.t4models" version="2.6.4" targetFramework="net461" />
   <package id="LinqKit" version="1.1.17" targetFramework="net461" />
+  <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net461" />
+  <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
   <package id="NUnit" version="3.12.0" targetFramework="net461" />
   <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net461" />
+  <package id="System.Spatial" version="5.6.4" targetFramework="net461" />
 </packages>
\ No newline at end of file

src/Action/Action.csproj

@@ -61,6 +61,12 @@
     <Reference Include="LinqKit, Version=1.1.17.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL">
       <HintPath>..\packages\LinqKit.1.1.17\lib\net45\LinqKit.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
+    </Reference>
     <Reference Include="microsoft.identitymodel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.7.0.0\lib\net35\microsoft.identitymodel.dll</HintPath>
     </Reference>
@@ -85,6 +91,9 @@
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/Action/Implementations/Project/SharePointSiteAction.cs

@@ -40,7 +40,18 @@ namespace Coscine.Action.Implementations.Project
                 var projectUrl = SharePointUtil.EnsureProjectUrl(rootSite, sharePointSite, project);
                 var owner = rootSite.RootWeb.SiteAdministrators[0];
                 var ownerLogin = (owner.LoginName.StartsWith("i:") ? "" : "i:0#.w|") + owner.LoginName;
-                rootSite.WebApplication.Sites.Add(projectUrl, project.DisplayName, project.Description, (uint)1033, "STS#0", ownerLogin, owner.Name, owner.Email);
+                rootSite.WebApplication.Sites.Add(new SPSiteCollectionAddParameters()
+                {
+                    SiteUrl = projectUrl,
+                    Title = project.DisplayName,
+                    Description = project.Description,
+                    LCID = (uint)1033,
+                    WebTemplate = "STS#1",
+                    OwnerLogin = ownerLogin,
+                    OwnerName = owner.Name,
+                    OwnerEmail = owner.Email,
+                    CreateFromSiteMaster = true
+                });
 
                 using (SPSite projectSite = new SPSite(projectUrl, systemAccount))
                 {

src/Action/Utils/PageUtil.cs

@@ -57,23 +57,38 @@ namespace Coscine.Action.Utils
         private void DeployPages(SPSite site, string path)
         {
             SPFolder libraryFolder = site.RootWeb.GetFolder("SitePages");
+            if (!libraryFolder.Exists)
+            {
+                site.RootWeb.Lists.Add("SitePages", "SitePages", SPListTemplateType.DocumentLibrary);
+                libraryFolder = site.RootWeb.GetFolder("SitePages");
+            }
+
             SPFileCollection files = libraryFolder.Files;
 
             DeleteAllFiles(files);
 
-            foreach(var file in Directory.EnumerateFiles(path))
+            foreach (var file in Directory.EnumerateFiles(path))
             {
                 var fileInfo = new FileInfo(file);
                 string data = File.ReadAllText(file);
                 data = EmbedSPWebPart(site, data, "[[DiscussionBoardId]]", "Discussion Board", SPListTemplateType.DiscussionBoard);
                 data = EmbedSPWebPart(site, data, "[[AnnouncementBoardId]]", "Announcement Board", SPListTemplateType.Announcements);
-                data = EmbedSPWebPart(site, data, "[[DocumentLibraryId]]", "Documents", SPListTemplateType.DocumentLibrary);
+                data = EmbedSPWebPart(site, data, "[[DocumentLibraryId]]", "Shared Documents", SPListTemplateType.DocumentLibrary);
                 byte[] bytes = Encoding.ASCII.GetBytes(data);
                 using (var stream = new MemoryStream(bytes))
                 {
                     files.Add(fileInfo.Name, stream);
                 }
             }
+
+            SPWeb web = site.RootWeb;
+            if (web != null)
+            {
+                SPFolder rootFolder = web.RootFolder;
+                rootFolder.WelcomePage = "SitePages/Home.aspx";
+                rootFolder.Update();
+            }
+
         }
 
         private string EmbedSPWebPart(SPSite site, string data, string key, string identifier, SPListTemplateType templateType)
@@ -85,7 +100,7 @@ namespace Coscine.Action.Utils
                     site.RootWeb.Lists.Add(identifier, identifier, templateType);
                 }
                 var spList = site.RootWeb.Lists[identifier];
-                return data.Replace(key, spList.ID.ToString("B").ToUpper()); ;
+                return data.Replace(key, spList.ID.ToString("B").ToUpper());
             }
             return data;
         }
@@ -98,7 +113,7 @@ namespace Coscine.Action.Utils
             {
                 fileList.Add(file);
             }
-            foreach(var file in fileList)
+            foreach (var file in fileList)
             {
                 file.Delete();
             }

src/Action/app.config

@@ -30,6 +30,14 @@
         <assemblyIdentity name="Coscine.Configuration" publicKeyToken="ce3d7a32d7dc1e5a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

src/Action/packages.config

@@ -9,10 +9,13 @@
   <package id="linq2db.SqlServer" version="2.6.4" targetFramework="net461" />
   <package id="linq2db.t4models" version="2.6.4" targetFramework="net461" />
   <package id="LinqKit" version="1.1.17" targetFramework="net461" />
+  <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net461" />
+  <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net461" />
   <package id="Microsoft.IdentityModel" version="7.0.0" targetFramework="net461" />
   <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" targetFramework="net461" />
   <package id="Microsoft.IdentityModel.Logging" version="5.6.0" targetFramework="net461" />
   <package id="Microsoft.IdentityModel.Tokens" version="5.6.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
   <package id="System.IdentityModel.Tokens.Jwt" version="5.6.0" targetFramework="net461" />
+  <package id="System.Spatial" version="5.6.4" targetFramework="net461" />
 </packages>
\ No newline at end of file