diff --git a/src/Project.Tests/Project.Tests.csproj b/src/Project.Tests/Project.Tests.csproj index d7b38e76aba64b0c6a02303ccf43fd0d4f43ec2b..843ca28d38b4b47ccb9f157a6acb1c59cbf523b5 100644 --- a/src/Project.Tests/Project.Tests.csproj +++ b/src/Project.Tests/Project.Tests.csproj @@ -56,8 +56,8 @@ <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> <HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath> </Reference> - <Reference Include="Coscine.Action, Version=1.10.0.0, Culture=neutral, processorArchitecture=AMD64"> - <HintPath>..\packages\Coscine.Action.1.10.0\lib\net461\Coscine.Action.dll</HintPath> + <Reference Include="Coscine.Action, Version=1.11.0.0, Culture=neutral, processorArchitecture=AMD64"> + <HintPath>..\packages\Coscine.Action.1.11.0\lib\net461\Coscine.Action.dll</HintPath> </Reference> <Reference Include="Coscine.ApiCommons, Version=1.7.0.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.ApiCommons.1.7.0\lib\net461\Coscine.ApiCommons.dll</HintPath> @@ -65,8 +65,8 @@ <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath> </Reference> - <Reference Include="Coscine.Database, Version=1.17.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Database.1.17.0\lib\net461\Coscine.Database.dll</HintPath> + <Reference Include="Coscine.Database, Version=1.18.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Database.1.18.0\lib\net461\Coscine.Database.dll</HintPath> </Reference> <Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath> @@ -74,9 +74,6 @@ <Reference Include="Coscine.ProxyApi, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.ProxyApi.1.2.1\lib\net461\Coscine.ProxyApi.dll</HintPath> </Reference> - <Reference Include="Coscine.SharePoint.Webparts.Vue, Version=1.5.0.0, Culture=neutral, PublicKeyToken=0fe8d3e516df6d98, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.SharePoint.Webparts.Vue.1.5.0\lib\net461\Coscine.SharePoint.Webparts.Vue.dll</HintPath> - </Reference> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath> </Reference> diff --git a/src/Project.Tests/app.config b/src/Project.Tests/app.config index 400cafb7cdb9494406790799143d3f2188d5b54b..867dc1b03f122a2273934f96e9d7e55fe50bb251 100644 --- a/src/Project.Tests/app.config +++ b/src/Project.Tests/app.config @@ -88,7 +88,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-1.17.0.0" newVersion="1.17.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" /> diff --git a/src/Project.Tests/packages.config b/src/Project.Tests/packages.config index 31875c383b7c5e44b58e0f6034dd51b0f575f5c9..089bcf1a059bc3ec8d96988f177f251031a17b70 100644 --- a/src/Project.Tests/packages.config +++ b/src/Project.Tests/packages.config @@ -4,13 +4,12 @@ <package id="AutoMapper.Extensions.Microsoft.DependencyInjection" version="6.0.0" targetFramework="net472" /> <package id="Castle.Core" version="4.4.0" targetFramework="net472" /> <package id="Consul" version="0.7.2.6" targetFramework="net472" /> - <package id="Coscine.Action" version="1.10.0" targetFramework="net472" /> + <package id="Coscine.Action" version="1.11.0" targetFramework="net472" /> <package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" /> <package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" /> - <package id="Coscine.Database" version="1.17.0" targetFramework="net472" /> + <package id="Coscine.Database" version="1.18.0" targetFramework="net472" /> <package id="Coscine.Logging" version="1.1.0" targetFramework="net472" /> <package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" /> - <package id="Coscine.SharePoint.Webparts.Vue" version="1.5.0" targetFramework="net472" /> <package id="EntityFramework" version="6.2.0" targetFramework="net472" /> <package id="HtmlAgilityPack" version="1.8.2" targetFramework="net472" /> <package id="linq2db" version="2.6.4" targetFramework="net472" /> diff --git a/src/Project/App.config b/src/Project/App.config index 587f0a052b98da4cffd2f85b42463572160a37ef..05894e09b04cd7480e727c63df0d89870483baed 100644 --- a/src/Project/App.config +++ b/src/Project/App.config @@ -91,7 +91,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-1.17.0.0" newVersion="1.17.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" /> diff --git a/src/Project/Controllers/ProjectController.cs b/src/Project/Controllers/ProjectController.cs index fa0c5cf8516fa256a7ea62d6cf803be9fd868a41..61b67fdc9303c6e54eb2dfdcffd52951da315afc 100644 --- a/src/Project/Controllers/ProjectController.cs +++ b/src/Project/Controllers/ProjectController.cs @@ -25,6 +25,7 @@ namespace Coscine.Api.Project.Controllers private readonly ProjectModel _projectModel; private readonly IConfiguration _configuration; private readonly Emitter _emitter; + private readonly ActivatedFeaturesModel _activatedFeaturesModel; private readonly ProjectRoleModel _projectRoleModel; private readonly CoscineLogger _coscineLogger; private readonly AnalyticsLogObject _analyticsLogObject; @@ -35,6 +36,7 @@ namespace Coscine.Api.Project.Controllers _configuration = Program.Configuration; _projectModel = new ProjectModel(); _emitter = new Emitter(_configuration); + _activatedFeaturesModel = new ActivatedFeaturesModel(); _projectRoleModel = new ProjectRoleModel(); _coscineLogger = new CoscineLogger(logger); _analyticsLogObject = new AnalyticsLogObject(); @@ -207,6 +209,11 @@ namespace Coscine.Api.Project.Controllers } } + if(isHard) + { + _activatedFeaturesModel.DeactivateAllFeatures(project); + } + if (isHard) { if (propegateAction) diff --git a/src/Project/Project.csproj b/src/Project/Project.csproj index 6dfb0c8d69d0752c5ea4e93253301b22ce8881fb..1732715d0cc23fee39d6566ff17be84d5e3388c9 100644 --- a/src/Project/Project.csproj +++ b/src/Project/Project.csproj @@ -49,8 +49,8 @@ <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> <HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath> </Reference> - <Reference Include="Coscine.Action, Version=1.10.0.0, Culture=neutral, processorArchitecture=AMD64"> - <HintPath>..\packages\Coscine.Action.1.10.0\lib\net461\Coscine.Action.dll</HintPath> + <Reference Include="Coscine.Action, Version=1.11.0.0, Culture=neutral, processorArchitecture=AMD64"> + <HintPath>..\packages\Coscine.Action.1.11.0\lib\net461\Coscine.Action.dll</HintPath> </Reference> <Reference Include="Coscine.ApiCommons, Version=1.7.0.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.ApiCommons.1.7.0\lib\net461\Coscine.ApiCommons.dll</HintPath> @@ -58,8 +58,8 @@ <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath> </Reference> - <Reference Include="Coscine.Database, Version=1.17.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Database.1.17.0\lib\net461\Coscine.Database.dll</HintPath> + <Reference Include="Coscine.Database, Version=1.18.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Database.1.18.0\lib\net461\Coscine.Database.dll</HintPath> </Reference> <Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath> @@ -67,9 +67,6 @@ <Reference Include="Coscine.ProxyApi, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.ProxyApi.1.2.1\lib\net461\Coscine.ProxyApi.dll</HintPath> </Reference> - <Reference Include="Coscine.SharePoint.Webparts.Vue, Version=1.5.0.0, Culture=neutral, PublicKeyToken=0fe8d3e516df6d98, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.SharePoint.Webparts.Vue.1.5.0\lib\net461\Coscine.SharePoint.Webparts.Vue.dll</HintPath> - </Reference> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath> </Reference> diff --git a/src/Project/packages.config b/src/Project/packages.config index dff17cca811289b509340edfead69f81e3348c47..9bb33f1e424ff7031522f5c259924a5a12e9a72a 100644 --- a/src/Project/packages.config +++ b/src/Project/packages.config @@ -4,13 +4,12 @@ <package id="AutoMapper.Extensions.Microsoft.DependencyInjection" version="6.0.0" targetFramework="net472" /> <package id="Castle.Core" version="4.4.0" targetFramework="net472" /> <package id="Consul" version="0.7.2.6" targetFramework="net472" /> - <package id="Coscine.Action" version="1.10.0" targetFramework="net472" /> + <package id="Coscine.Action" version="1.11.0" targetFramework="net472" /> <package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" /> <package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" /> - <package id="Coscine.Database" version="1.17.0" targetFramework="net472" /> + <package id="Coscine.Database" version="1.18.0" targetFramework="net472" /> <package id="Coscine.Logging" version="1.1.0" targetFramework="net472" /> <package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" /> - <package id="Coscine.SharePoint.Webparts.Vue" version="1.5.0" targetFramework="net472" /> <package id="EntityFramework" version="6.2.0" targetFramework="net472" /> <package id="HtmlAgilityPack" version="1.8.2" targetFramework="net472" /> <package id="linq2db" version="2.6.4" targetFramework="net472" />