Skip to content

update project type to sdkstyle #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kazan417 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update project type to sdkstyle #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f03613
initial solution port to new sdkstyle project type
kazan417 May 16, 2025
0abd98b
delete unnecessary target because added gitignore
kazan417 May 16, 2025
3f887a8
fix security issue by updating log4net to actual version
kazan417 May 16, 2025
09eef8f
fix security issue by updating jquery.ui.combined
kazan417 May 16, 2025
0d8c63f
fix security bug by uodating jwt library
kazan417 May 16, 2025
63f1adc
remove unnecessary link from sln
kazan417 May 17, 2025
90b1396
return to original name build.proj
kazan417 May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
401 changes: 401 additions & 0 deletions .gitignore
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Studio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29920.165
# Visual Studio Version 17
VisualStudioVersion = 17.13.35931.197
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.ActiveDirectory", "common\ASC.ActiveDirectory\ASC.ActiveDirectory.csproj", "{E588E818-F163-470C-802C-3A6E45B36080}"
EndProject
Expand Down Expand Up @@ -121,11 +121,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Files.ThumbnailBuilder"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.SsoAuth.Svc", "module\ASC.SsoAuth.Svc\ASC.SsoAuth.Svc.csproj", "{531C54F5-D6F3-4047-8C35-685C6CD94EC7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9AF8FFC6-4D0C-4A97-A2E0-A2B8B1AB3225}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Files.AutoCleanUp", "module\ASC.Files.AutoCleanUp\ASC.Files.AutoCleanUp.csproj", "{F120112A-92BB-4F9F-AE3F-3F0459192C9E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Migration", "module\ASC.Migration\ASC.Migration.csproj", "{72D10CCA-CCF1-4E2F-A17D-443917B154CB}"
Expand All @@ -134,6 +129,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Api.Migration", "module
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.WebDav.Svc", "module\ASC.WebDav.Svc\ASC.WebDav.Svc.csproj", "{B84EC090-06B6-4960-A847-51017D3B0743}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Элементы решения", "Элементы решения", "{754FC069-D67B-A9D7-50A1-8D1CA196D8F1}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
146 changes: 73 additions & 73 deletions build/msbuild/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.AssemblyInfo" />
<UsingTask AssemblyFile="$(ASCDir)web\core\ASC.Web.Core.BuildTask\bin\$(Configuration)\ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.ReplaceResources" />
<PropertyGroup>
<ASCDir>..\..\</ASCDir>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<ConfigurationSites Condition=" '$(ConfigurationSites)' == '' ">Debug</ConfigurationSites>
<BuildTargets Condition=" '$(BuildTargets)' == '' ">Restore;Build</BuildTargets>
<BuildTargets Condition=" '$(BuildTargets)' == 'ReBuild' ">Restore;ReBuild</BuildTargets>
<ReplaceResources Condition="$(ReplaceResources)==''">0</ReplaceResources>
<DeploySites Condition="'$(DeploySites)' == ''">0</DeploySites>
<YarnBuild Condition="'$(YarnBuild)' == ''">true</YarnBuild>
</PropertyGroup>
<Target Name="BuildTask">
<MSBuild
BuildInParallel="true"
Projects="$(ASCDir)web\core\ASC.Web.Core.sln"
Targets="Restore;Build"
Properties="Configuration=$(Configuration);AlToolPath=%(AlToolPath.FullPath);Constants=$(Constants);Disable_CopyWebApplication=true"
StopOnFirstFailure="true"/>
</Target>
<Target Name="ReplaceResources">
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\custom.resources.json" />
</Target>
<Target Name="Build">
<CreateItem Include="$(ASCDir)\build\msbuild\">
<Output ItemName="AlToolPath" TaskParameter="Include"/>
</CreateItem>
<CallTarget Targets="BuildTask" Condition=" '$(ReplaceResources)' == '1' OR '$(GenerateBundle)' == '1' OR '$(GenerateHelpCenterHtml)' == '1'"/>
<CallTarget Targets="ReplaceResources" Condition=" '$(ReplaceResources)' == '1' "/>
<MSBuild
BuildInParallel="true"
Projects="$(ASCDir)Studio.sln"
Targets="$(BuildTargets)"
Properties="Configuration=$(Configuration);DeployTo=$(DeployTo);AlToolPath=%(AlToolPath.FullPath);Constants=$(Constants)"
RebaseOutputs="true"
StopOnFirstFailure="true"/>
</Target>
<ItemGroup>
<NodeProject Include="$(ASCDir)module\ASC.Socket.IO\" />
<NodeProject Include="$(ASCDir)module\ASC.Thumbnails\" />
<NodeProject Include="$(ASCDir)module\ASC.UrlShortener\" />
<NodeProject Include="$(ASCDir)module\ASC.SsoAuth\" />
<NodeProject Include="$(ASCDir)module\ASC.WebDav\" />
</ItemGroup>
<Target Name="YarnInstall" AfterTargets="Build" Condition="$(YarnBuild) == 'true' " >
<Exec Command="yarn install --frozen-lockfile" WorkingDirectory="%(NodeProject.Identity)" ContinueOnError="true"/>
</Target>
<Target Name="SetAssemblyInfo">
<Message Text="%(ProjectToBuild.Filename)"/>
<AssemblyInfo CodeLanguage="CS"
OutputFile="%(ProjectToBuild.RootDir)%(ProjectToBuild.Directory)Properties\AssemblyInfo.cs"
AssemblyProduct="ONLYOFFICE"
AssemblyTitle="%(ProjectToBuild.Filename)"
AssemblyCompany="Ascensio System SIA"
AssemblyCopyright="Ascensio System SIA 2015"
AssemblyTrademark="ONLYOFFICE™"
AssemblyVersion="8.0.0.0"
AssemblyFileVersion="8.0.0.0"/>
</Target>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">

<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.AssemblyInfo" />
<UsingTask AssemblyFile="$(ASCDir)web\core\ASC.Web.Core.BuildTask\bin\$(Configuration)\ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.ReplaceResources" />

<PropertyGroup>
<ASCDir>..\..\</ASCDir>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<ConfigurationSites Condition=" '$(ConfigurationSites)' == '' ">Debug</ConfigurationSites>
<BuildTargets Condition=" '$(BuildTargets)' == '' ">Restore;Build</BuildTargets>
<BuildTargets Condition=" '$(BuildTargets)' == 'ReBuild' ">Restore;ReBuild</BuildTargets>
<ReplaceResources Condition="$(ReplaceResources)==''">0</ReplaceResources>
<DeploySites Condition="'$(DeploySites)' == ''">0</DeploySites>
<YarnBuild Condition="'$(YarnBuild)' == ''">true</YarnBuild>
</PropertyGroup>

<Target Name="BuildTask">
<MSBuild
BuildInParallel="true"
Projects="$(ASCDir)web\core\ASC.Web.Core.sln"
Targets="Restore;Build"
Properties="Configuration=$(Configuration);AlToolPath=%(AlToolPath.FullPath);Constants=$(Constants);Disable_CopyWebApplication=true"
StopOnFirstFailure="true"/>
</Target>

<Target Name="ReplaceResources">
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\custom.resources.json" />
</Target>


<Target Name="Build">
<CreateItem Include="$(ASCDir)\build\msbuild\">
<Output ItemName="AlToolPath" TaskParameter="Include"/>
</CreateItem>

<CallTarget Targets="BuildTask" Condition=" '$(ReplaceResources)' == '1' OR '$(GenerateBundle)' == '1' OR '$(GenerateHelpCenterHtml)' == '1'"/>
<CallTarget Targets="ReplaceResources" Condition=" '$(ReplaceResources)' == '1' "/>

<MSBuild
BuildInParallel="true"
Projects="$(ASCDir)Studio.sln"
Targets="$(BuildTargets)"
Properties="Configuration=$(Configuration);DeployTo=$(DeployTo);AlToolPath=%(AlToolPath.FullPath);Constants=$(Constants)"
RebaseOutputs="true"
StopOnFirstFailure="true"/>
</Target>

<ItemGroup>
<NodeProject Include="$(ASCDir)module\ASC.Socket.IO\" />
<NodeProject Include="$(ASCDir)module\ASC.Thumbnails\" />
<NodeProject Include="$(ASCDir)module\ASC.UrlShortener\" />
<NodeProject Include="$(ASCDir)module\ASC.SsoAuth\" />
<NodeProject Include="$(ASCDir)module\ASC.WebDav\" />
</ItemGroup>

<Target Name="YarnInstall" AfterTargets="Build" Condition="$(YarnBuild) == 'true' " >
<Exec Command="yarn install --frozen-lockfile" WorkingDirectory="%(NodeProject.Identity)" ContinueOnError="true"/>
</Target>

<Target Name="SetAssemblyInfo">
<Message Text="%(ProjectToBuild.Filename)"/>
<AssemblyInfo CodeLanguage="CS"
OutputFile="%(ProjectToBuild.RootDir)%(ProjectToBuild.Directory)Properties\AssemblyInfo.cs"
AssemblyProduct="ONLYOFFICE"
AssemblyTitle="%(ProjectToBuild.Filename)"
AssemblyCompany="Ascensio System SIA"
AssemblyCopyright="Ascensio System SIA 2015"
AssemblyTrademark="ONLYOFFICE™"
AssemblyVersion="8.0.0.0"
AssemblyFileVersion="8.0.0.0"/>
</Target>

</Project>
92 changes: 15 additions & 77 deletions common/ASC.ActiveDirectory/ASC.ActiveDirectory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E588E818-F163-470C-802C-3A6E45B36080}</ProjectGuid>
<TargetFramework>net48</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ASC.ActiveDirectory</RootNamespace>
<AssemblyName>ASC.ActiveDirectory</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<FileAlignment>512</FileAlignment>
<OutputPath>..\..\web\studio\ASC.Web.Studio\bin\</OutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Configurations>Debug;MvcOnly;Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\web\studio\ASC.Web.Studio\bin\ASC.ActiveDirectory.xml</DocumentationFile>
<NoWarn>CS1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Base\Data\LdapObjectExtension.cs" />
<Compile Include="Base\Data\LdapLogin.cs" />
<Compile Include="Base\Data\LdapObject.cs" />
<Compile Include="Base\LdapHelper.cs" />
<Compile Include="Base\LdapNotifySource.cs" />
<Compile Include="Base\LdapUserImporter.cs" />
<Compile Include="Base\LdapNotifyHelper.cs" />
<Compile Include="Base\LdapNotifyConstants.cs" />
<Compile Include="Base\Settings\LdapSettingsChecker.cs" />
<Compile Include="Base\Settings\LdapSettingsStatus.cs" />
<Compile Include="Base\Settings\LdapSettings.cs" />
<Compile Include="ComplexOperations\Data\LdapItemChange.cs" />
<Compile Include="ComplexOperations\Data\LdapChangeCollection.cs" />
<Compile Include="ComplexOperations\Data\LdapChangeEnums.cs" />
<Compile Include="ComplexOperations\Data\LdapChange.cs" />
<Compile Include="ComplexOperations\LdapLocalization.cs" />
<Compile Include="ComplexOperations\LdapOperation.cs" />
<Compile Include="ComplexOperations\LdapOperationType.cs" />
<Compile Include="ComplexOperations\LdapSaveSyncOperation.cs" />
<Compile Include="LdapUserManager.cs" />
<Compile Include="ComplexOperations\LdapOperationStatus.cs" />
<Compile Include="Base\LdapConstants.cs" />
<Compile Include="Base\Expressions\Criteria.cs" />
<Compile Include="Base\Expressions\CriteriaType.cs" />
<Compile Include="Base\Expressions\Expression.cs" />
<Compile Include="Base\Expressions\Op.cs" />
<Compile Include="LdapUtils.cs" />
<Compile Include="Novell\Data\NovellLdapObject.cs" />
<Compile Include="Novell\NovellLdapUserImporter.cs" />
<Compile Include="Base\Data\LdapCertificateConfirmRequest.cs" />
<Compile Include="Novell\Extensions\NovellLdapEntryExtension.cs" />
<Compile Include="Novell\NovellLdapHelper.cs" />
<Compile Include="Novell\Exceptions\NovellLdapTlsCertificateRequestedException.cs" />
<Compile Include="Novell\NovellLdapSearcher.cs" />
<Compile Include="Novell\NovellLdapSettingsChecker.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\web\core\ASC.Web.Core\ASC.Web.Core.csproj">
<Project>{02C40A64-FE22-41D0-9037-69F0D6F787A9}</Project>
<Name>ASC.Web.Core</Name>
</ProjectReference>
<ProjectReference Include="..\ASC.Common\ASC.Common.csproj">
<Project>{76de7717-3d4b-4a5b-b740-15b8913df0cb}</Project>
<Name>ASC.Common</Name>
</ProjectReference>
<ProjectReference Include="..\ASC.Core.Common\ASC.Core.Common.csproj">
<Project>{a51d0454-4afa-46de-89d4-b03d37e1816c}</Project>
<Name>ASC.Core.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<ProjectReference Include="..\..\web\core\ASC.Web.Core\ASC.Web.Core.csproj" />
<ProjectReference Include="..\ASC.Common\ASC.Common.csproj" />
<ProjectReference Include="..\ASC.Core.Common\ASC.Core.Common.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
Expand All @@ -101,7 +34,12 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime.Serialization" />
<Compile Remove="ASC.ActiveDirectory.Tests\Login\LoginAcceptedTests.cs" />
<Compile Remove="ASC.ActiveDirectory.Tests\Properties\AssemblyInfo.cs" />
<Compile Remove="ASC.ActiveDirectory.Tests\Query\ParseTests.cs" />
<Compile Remove="ASC.ActiveDirectory.Tests\Utils\LdapHelperTests.cs" />
<Compile Remove="BuiltIn\SystemLdapHelper.cs" />
<Compile Remove="BuiltIn\SystemLdapSearcher.cs" />
<Compile Remove="BuiltIn\SystemLdapSettingsChecker.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading