Skip to content

Commit 4ac38fa

Browse files
author
Anton Rychenkov
authored
Update to 11.5.2 (#304)
1 parent 5e4fa34 commit 4ac38fa

File tree

3,172 files changed

+781745
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,172 files changed

+781745
-179
lines changed

‎build/config/TeamLabSvc.exe.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,6 @@
194194
<scheduler name="CRM" register="ASC.Web.CRM.Configuration.ProductEntryPoint.RegisterSendMethods, ASC.Web.CRM" />
195195
</schedulers>
196196
</notify>
197-
<backup>
198-
<cleaner />
199-
<scheduler />
200-
</backup>
201197
<feed aggregatePeriod="0:3:0" />
202198
<autoreply mailFolder="..\..\Logs\" />
203199
<socketio path="..\ASC.Socket.IO" port="9899">

‎build/install/deb/Files/god/conf.d/services.god

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabMailCleaner" => 9819, "teamlabMailWatchdog" => 9818, "teamlabFeed" => 9808 };
2+
3+
%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder MailCleaner MailWatchdog Feed}.each do |serviceName|
4+
God.watch do |w|
5+
w.name = serviceName
6+
w.group = "onlyoffice"
7+
w.grace = 15.seconds
8+
w.start = "systemctl start onlyoffice#{serviceName}"
9+
w.stop = "systemctl stop onlyoffice#{serviceName}"
10+
w.restart = "systemctl restart onlyoffice#{serviceName}"
11+
w.pid_file = "/tmp/onlyoffice#{serviceName}"
12+
13+
w.behavior(:clean_pid_file)
14+
15+
w.start_if do |start|
16+
start.condition(:process_running) do |c|
17+
c.interval = 10.seconds
18+
c.running = false
19+
end
20+
end
21+
22+
w.restart_if do |restart|
23+
restart.condition(:http_response_code) do |c|
24+
c.host = 'localhost'
25+
c.port = dictionary["teamlab#{serviceName}"]
26+
c.path = "/teamlab#{serviceName}/health/check"
27+
c.code_is_not = 200
28+
c.times = 5
29+
c.interval = 5.seconds
30+
end
31+
end
32+
end
33+
end

‎build/install/deb/debian/onlyofficeSsoAuth.service

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[Unit]
2+
Description=ONLYOFFICE SsoAuth Service
3+
After=network.target syslog.target
4+
5+
[Service]
6+
Type=forking
7+
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeSsoAuth'
8+
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeSsoAuth /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service \"ASC.SsoAuth.Svc.Launcher,ASC.SsoAuth.Svc\" --log SsoAuth
9+
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
10+
User=onlyoffice
11+
Group=onlyoffice
12+
# Give up if ping don't get an answer
13+
TimeoutSec=600
14+
15+
Restart=no
16+
PrivateTmp=false
17+
18+
[Install]
19+
WantedBy=multi-user.target

‎build/install/deb/debian/onlyofficeThumbnailBuilder.service

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[Unit]
2+
Description=ONLYOFFICE ThumbnailBuilder Service
3+
After=network.target syslog.target mysqld.service redis-server.service
4+
Wants=mysqld.service redis-server.service
5+
6+
[Service]
7+
Type=forking
8+
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeThumbnailBuilder'
9+
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeThumbnailBuilder /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service "ASC.Files.ThumbnailBuilder.Launcher,ASC.Files.ThumbnailBuilder" --log ThumbnailBuilder
10+
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
11+
User=onlyoffice
12+
Group=onlyoffice
13+
# Give up if ping don't get an answer
14+
TimeoutSec=600
15+
16+
# Auto-Restart every 24 hours
17+
WatchdogSec=24h
18+
19+
Restart=no
20+
PrivateTmp=false
21+
22+
[Install]
23+
WantedBy=multi-user.target

‎build/install/rpm/Files/god/conf.d/services.god

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabMailCleaner" => 9819, "teamlabMailWatchdog" => 9818, "teamlabFeed" => 9808 };
2+
3+
%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder MailCleaner MailWatchdog Feed}.each do |serviceName|
4+
God.watch do |w|
5+
w.name = serviceName
6+
w.group = "onlyoffice"
7+
w.grace = 15.seconds
8+
w.start = "systemctl start onlyoffice#{serviceName}"
9+
w.stop = "systemctl stop onlyoffice#{serviceName}"
10+
w.restart = "systemctl restart onlyoffice#{serviceName}"
11+
w.pid_file = "/tmp/onlyoffice#{serviceName}"
12+
13+
w.behavior(:clean_pid_file)
14+
15+
w.start_if do |start|
16+
start.condition(:process_running) do |c|
17+
c.interval = 10.seconds
18+
c.running = false
19+
end
20+
end
21+
22+
w.restart_if do |restart|
23+
restart.condition(:http_response_code) do |c|
24+
c.host = 'localhost'
25+
c.port = dictionary["teamlab#{serviceName}"]
26+
c.path = "/teamlab#{serviceName}/health/check"
27+
c.code_is_not = 200
28+
c.times = 5
29+
c.interval = 5.seconds
30+
end
31+
end
32+
end
33+
end

‎build/install/rpm/Files/systemd/onlyofficeSsoAuth.service

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[Unit]
2+
Description=ONLYOFFICE SsoAuth Service
3+
After=network.target syslog.target
4+
5+
[Service]
6+
Type=forking
7+
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeSsoAuth'
8+
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeSsoAuth /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service \"ASC.SsoAuth.Svc.Launcher,ASC.SsoAuth.Svc\" --log SsoAuth
9+
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
10+
User=onlyoffice
11+
Group=onlyoffice
12+
# Give up if ping don't get an answer
13+
TimeoutSec=600
14+
15+
Restart=no
16+
PrivateTmp=false
17+
18+
[Install]
19+
WantedBy=multi-user.target

‎build/install/rpm/Files/systemd/onlyofficeThumbnailBuilder.service

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[Unit]
2+
Description=ONLYOFFICE ThumbnailBuilder Service
3+
After=network.target syslog.target mysqld.service redis-server.service
4+
Wants=mysqld.service redis-server.service
5+
6+
[Service]
7+
Type=forking
8+
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeThumbnailBuilder'
9+
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeThumbnailBuilder /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service "ASC.Files.ThumbnailBuilder.Launcher,ASC.Files.ThumbnailBuilder" --log ThumbnailBuilder
10+
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
11+
User=onlyoffice
12+
Group=onlyoffice
13+
# Give up if ping don't get an answer
14+
TimeoutSec=600
15+
16+
# Auto-Restart every 24 hours
17+
WatchdogSec=24h
18+
19+
Restart=no
20+
PrivateTmp=false
21+
22+
[Install]
23+
WantedBy=multi-user.target

‎build/msbuild/Copyright/CommandLine.dll

57 KB
Binary file not shown.

‎build/msbuild/Copyright/copyright.proj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<RootDir Condition="$(RootDir)==''">..\..\..\</RootDir>
5+
<MsbuildDir>$(RootDir)build\msbuild\</MsbuildDir>
6+
<CopyrightDir>$(MsbuildDir)Copyright\</CopyrightDir>
7+
<ChangeCopyright Condition="'$(ChangeCopyright)' == ''">0</ChangeCopyright>
8+
</PropertyGroup>
9+
10+
<UsingTask AssemblyFile="$(MsbuildDir)ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.WriteCopyrightText" />
11+
12+
<Target Name="Build">
13+
<CallTarget Targets="WriteCopyrightText" Condition=" '$(ChangeCopyright)' == '1' "/>
14+
</Target>
15+
16+
<Target Name="WriteCopyrightText">
17+
<!--
18+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)empty.txt" Ignore="file:$(CopyrightDir)Ignore.txt"/>
19+
-->
20+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKTCopyright.txt" Ignore="file:$(CopyrightDir)Ignore.txt"/>
21+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKT.txt" Include="*AssemblyInfo.cs" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)AscensioSystem.txt"/>
22+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7.txt" Include="*.license" Ignore="\common\ASC.Billing.Service\" Replace="file:$(CopyrightDir)Onlyoffice.txt"/>
23+
<!--
24+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKT.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)AscensioSystem.txt"/>
25+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7Domain.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)OnlyofficeDomain.txt"/>
26+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)Onlyoffice.txt"/>
27+
-->
28+
</Target>
29+
30+
</Project>

‎build/msbuild/Copyright/crwriter.exe

14.5 KB
Binary file not shown.

‎build/msbuild/Copyright/updateCopyrightYear.proj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<RootDir Condition="$(RootDir)==''">..\..\..\</RootDir>
5+
<MsbuildDir>$(RootDir)build\msbuild\</MsbuildDir>
6+
<CopyrightDir>$(MsbuildDir)Copyright\</CopyrightDir>
7+
<ChangeCopyright Condition="'$(ChangeCopyright)' == ''">0</ChangeCopyright>
8+
</PropertyGroup>
9+
10+
<UsingTask AssemblyFile="$(MsbuildDir)ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.WriteCopyrightText" />
11+
12+
<Target Name="Build">
13+
<CallTarget Targets="WriteCopyrightText" Condition=" '$(ChangeCopyright)' == '1' "/>
14+
</Target>
15+
16+
<Target Name="WriteCopyrightText">
17+
18+
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" Ignore="file:$(CopyrightDir)Ignore.txt"/>
19+
20+
</Target>
21+
22+
</Project>

‎build/msbuild/applyMailSubstitutions.proj

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">
3+
4+
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
5+
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Xml.XmlMassUpdate" />
6+
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.CopyDirectory" />
7+
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.RemoveDuplicatesAssemblies" />
8+
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.RegexReplace" />
9+
10+
<PropertyGroup>
11+
<Configuration Condition="$(Configuration)==''">Debug</Configuration>
12+
<RootDir Condition="$(RootDir)==''">..\..\</RootDir>
13+
<DeployTo Condition="$(DeployTo)==''">localhost</DeployTo>
14+
<DeployDir Condition="$(DeployDir)==''">$(RootDir)build\deploy\</DeployDir>
15+
<MailFilesDir>$(DeployDir)MailFiles\</MailFilesDir>
16+
<OutDir Condition="$(OutDir)==''">$(DeployDir)$(DeployTo)\</OutDir>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<MailFiles Include="$(MailFilesDir)/Services/**/*" />
21+
</ItemGroup>
22+
23+
<Target Name="Deploy">
24+
<Message Text="Deploy parameters:"/>
25+
<Message Text=" DeployTo = $(DeployTo)"/>
26+
27+
<RemoveDir Directories="$(OutDir)" ContinueOnError="true" Condition="'$(LeaveOutDir)' != '0'" />
28+
29+
<Copy
30+
SourceFiles="@(MailFiles)"
31+
DestinationFolder="$(OutDir)/Services/%(MailFiles.RecursiveDir)"/>
32+
33+
<CallTarget Targets="ChangeConfigs" Condition=" Exists( '$(MailFilesDir)Substitutions\' ) "/>
34+
35+
</Target>
36+
37+
<Target Name="ChangeConfigs">
38+
<ItemGroup>
39+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.autofac.config" >
40+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
41+
</ConfigFiles>
42+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.consumers.config" >
43+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Consumers.Config.Substitutions.xml</SubstitutionsFile>
44+
</ConfigFiles>
45+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.storage.config" >
46+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
47+
</ConfigFiles>
48+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\mail.agg.log4net.config">
49+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Log4net.Substitutions.xml</SubstitutionsFile>
50+
</ConfigFiles>
51+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\mail.agg.nlog.config">
52+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.NLog.Substitutions.xml</SubstitutionsFile>
53+
</ConfigFiles>
54+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\ASC.Mail.Aggregator.CollectionService.exe.config">
55+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Substitutions.xml</SubstitutionsFile>
56+
</ConfigFiles>
57+
<ConfigFiles Include="$(OutDir)Services\MailAggregator\ASC.Mail.EmlDownloader.exe.config">
58+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Substitutions.xml</SubstitutionsFile>
59+
</ConfigFiles>
60+
61+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.autofac.config" >
62+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
63+
</ConfigFiles>
64+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.consumers.config" >
65+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Consumers.Config.Substitutions.xml</SubstitutionsFile>
66+
</ConfigFiles>
67+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.storage.config" >
68+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
69+
</ConfigFiles>
70+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\mail.agg.log4net.config">
71+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Log4net.Substitutions.xml</SubstitutionsFile>
72+
</ConfigFiles>
73+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\mail.agg.nlog.config">
74+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.NLog.Substitutions.xml</SubstitutionsFile>
75+
</ConfigFiles>
76+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\ASC.Mail.Aggregator.CollectionService.exe.config">
77+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Substitutions.xml</SubstitutionsFile>
78+
</ConfigFiles>
79+
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\ASC.Mail.EmlDownloader.exe.config">
80+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Substitutions.xml</SubstitutionsFile>
81+
</ConfigFiles>
82+
83+
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\web.autofac.config" >
84+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
85+
</ConfigFiles>
86+
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\ASC.Mail.Watchdog.Service.exe.config">
87+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.Substitutions.xml</SubstitutionsFile>
88+
</ConfigFiles>
89+
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\mail.dog.log4net.config">
90+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.Log4net.Substitutions.xml</SubstitutionsFile>
91+
</ConfigFiles>
92+
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\mail.dog.nlog.config">
93+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.NLog.Substitutions.xml</SubstitutionsFile>
94+
</ConfigFiles>
95+
96+
<ConfigFiles Include="$(OutDir)Services\MailCleaner\web.autofac.config" >
97+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
98+
</ConfigFiles>
99+
<ConfigFiles Include="$(OutDir)Services\MailCleaner\web.storage.config" >
100+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
101+
</ConfigFiles>
102+
<ConfigFiles Include="$(OutDir)Services\MailCleaner\ASC.Mail.StorageCleaner.exe.config">
103+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.Substitutions.xml</SubstitutionsFile>
104+
</ConfigFiles>
105+
<ConfigFiles Include="$(OutDir)Services\MailCleaner\mail.cln.log4net.config">
106+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.Log4net.Substitutions.xml</SubstitutionsFile>
107+
</ConfigFiles>
108+
<ConfigFiles Include="$(OutDir)Services\MailCleaner\mail.cln.nlog.config">
109+
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.NLog.Substitutions.xml</SubstitutionsFile>
110+
</ConfigFiles>
111+
112+
<ConfigFiles Remove="@(ConfigFiles)" Condition="!Exists('%(ConfigFiles.SubstitutionsFile)')"/>
113+
</ItemGroup>
114+
115+
<RegexReplace Expression="(.+)\." Input="$(DeployTo)">
116+
<Output PropertyName="Substitution" TaskParameter="Output"/>
117+
</RegexReplace>
118+
119+
<XmlMassUpdate
120+
Condition="$(Substitution) != $(DeployTo)"
121+
ContentFile="%(ConfigFiles.FullPath)"
122+
ContentRoot="/"
123+
SubstitutionsFile="%(ConfigFiles.SubstitutionsFile)"
124+
SubstitutionsRoot="/configuration/substitutions/$(Substitution)"
125+
NamespaceDefinitions="un=http://schemas.microsoft.com/practices/2010/unity"/>
126+
<XmlMassUpdate
127+
ContentFile="%(ConfigFiles.FullPath)"
128+
ContentRoot="/"
129+
SubstitutionsFile="%(ConfigFiles.SubstitutionsFile)"
130+
SubstitutionsRoot="/configuration/substitutions/$(DeployTo)"
131+
NamespaceDefinitions="un=http://schemas.microsoft.com/practices/2010/unity"/>
132+
</Target>
133+
134+
</Project>

‎build/msbuild/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<Target Name="ReplaceResources">
2727
<CallTarget Targets="BuildTask" />
28-
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\custom.resources.json" />
28+
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\r7.resources.json" />
2929
</Target>
3030

3131

0 commit comments

Comments
 (0)