Skip to content

Commit dbe9f5c

Browse files
committed
build: Добавлено принудительное использование UTF-8 при сборке
1 parent f704ddc commit dbe9f5c

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Build_Core.csproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
ItemName="BuildVariant"/>
7070
</CreateItem>
7171

72-
<Exec Command="dotnet publish &quot;src/%(BuildVariant.Identity)/%(BuildVariant.ProjectFile)&quot; -f %(BuildVariant.Framework) -c $(Configuration) -p:Platform=%(BuildVariant.Platform) -p:UseAppHost=false -o &quot;$(ArtifactsRoot)/fdd-%(BuildVariant.Suffix)/bin&quot;"/>
72+
<Exec Command="dotnet publish &quot;src/%(BuildVariant.Identity)/%(BuildVariant.ProjectFile)&quot; -f %(BuildVariant.Framework) -c $(Configuration) -p:Platform=%(BuildVariant.Platform) -p:UseAppHost=false -o &quot;$(ArtifactsRoot)/fdd-%(BuildVariant.Suffix)/bin&quot;" UseUtf8Encoding="Always"/>
7373

7474
<PropertyGroup>
7575
<CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>
@@ -105,9 +105,9 @@
105105
<RuntimeID Include="osx-arm64"/>
106106
</ItemGroup>
107107

108-
<Exec Command="dotnet publish &quot;src/oscript/oscript.csproj&quot; -r %(RuntimeID.Identity) --self-contained -c $(Configuration) -o &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/bin&quot;"/>
108+
<Exec Command="dotnet publish &quot;src/oscript/oscript.csproj&quot; -r %(RuntimeID.Identity) --self-contained -c $(Configuration) -o &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/bin&quot;" UseUtf8Encoding="Always"/>
109109

110-
<PropertyGroup>
110+
<PropertyGroup>
111111
<CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>
112112
</PropertyGroup>
113113

@@ -183,8 +183,8 @@
183183
<Output TaskParameter="FirstItem" PropertyName="Runner"/>
184184
</GetFirstItem>
185185

186-
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)/install/opm.ospx&quot; &quot;$(LibDir)/tmp&quot;"/>
187-
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(LibDir)/tmp/content.zip&quot; &quot;$(LibDir)/opm&quot;"/>
186+
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)/install/opm.ospx&quot; &quot;$(LibDir)/tmp&quot;" UseUtf8Encoding="Always"/>
187+
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(LibDir)/tmp/content.zip&quot; &quot;$(LibDir)/opm&quot;" UseUtf8Encoding="Always"/>
188188

189189
<Copy SourceFiles="$(MSBuildProjectDirectory)\install\package-loader.os" DestinationFolder="$(LibDir)"/>
190190
<RemoveDir Directories="$(LibDir)/tmp"/>
@@ -206,7 +206,8 @@
206206
<Exec Command="$(OpmLaunch) install -d &quot;$(LibDir)&quot; %(CoreLibraries.Identity)"
207207
IgnoreExitCode="false"
208208
EnvironmentVariables="@(ConfigEnv)"
209-
Condition="'$(SkipLibraryDownload)' == ''"/>
209+
Condition="'$(SkipLibraryDownload)' == ''"
210+
UseUtf8Encoding="Always"/>
210211

211212
</Target>
212213

@@ -258,6 +259,7 @@
258259
WorkingDirectory="$(TestsRoot)/%(TestAssemblies.Identity)"
259260
Command="dotnet test --logger:&quot;junit;LogFilePath=$(MSBuildProjectDirectory)/tests/%(TestAssemblies.Identity).xml&quot;"
260261
IgnoreExitCode="true"
262+
UseUtf8Encoding="Always"
261263
/>
262264

263265
</Target>
@@ -278,7 +280,8 @@
278280
WorkingDirectory="$(MSBuildProjectDirectory)\tests"
279281
Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\tests\testrunner.os&quot; -runall . xddReportPath ."
280282
IgnoreExitCode="true"
281-
ContinueOnError="true">
283+
ContinueOnError="true"
284+
UseUtf8Encoding="Always">
282285
<Output TaskParameter="ExitCode" PropertyName="TestsExitCode"/>
283286
</Exec>
284287

@@ -309,7 +312,7 @@
309312
<Output TaskParameter="FirstItem" PropertyName="Runner"/>
310313
</GetFirstItem>
311314

312-
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; pack &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/*&quot; &quot;$(ArtifactsRoot)/OneScript-$(ReleaseNumber)-%(RuntimeID.Identity).zip&quot;"/>
315+
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; pack &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/*&quot; &quot;$(ArtifactsRoot)/OneScript-$(ReleaseNumber)-%(RuntimeID.Identity).zip&quot;" UseUtf8Encoding="Always"/>
313316
<RemoveDir Directories="$(ArtifactsRoot)/%(RuntimeID.Identity)" />
314317
</Target>
315318

@@ -348,7 +351,7 @@
348351

349352
<Error Text="No nuget token (/p:NugetToken=) specified" Condition="'$(NugetToken)' == ''" />
350353
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\built\nuget"
351-
Command="dotnet nuget push %(NugetAbleProject.Identity).$(ReleaseNumber).nupkg -k $(NugetToken) -s https://api.nuget.org/v3/index.json"/>
354+
Command="dotnet nuget push %(NugetAbleProject.Identity).$(ReleaseNumber).nupkg -k $(NugetToken) -s https://api.nuget.org/v3/index.json" UseUtf8Encoding="Always"/>
352355

353356
</Target>
354357

0 commit comments

Comments
 (0)