Skip to content

Commit 00967af

Browse files
committed
Попытка починить сборку
1 parent 378a33d commit 00967af

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Build.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
3-
42
<PropertyGroup>
53
<ReleaseNumber Condition="'$(ReleaseNumber)' == ''">1.1.0</ReleaseNumber>
64
<BuildNumber Condition="'$(BUILD_NUMBER)' != ''">$(BUILD_NUMBER)</BuildNumber>
@@ -30,7 +28,7 @@
3028
</ItemGroup>
3129

3230
<Delete Files="@(TestsResults)" />
33-
<DeleteTree Directories="$(ArtifactsRoot)" Condition="Exists($(ArtifactsRoot))" />
31+
<RemoveDir Directories="$(ArtifactsRoot)" Condition="Exists($(ArtifactsRoot))" />
3432

3533
<MSBuild Projects="$(Solution)" Targets="restore;Clean" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName);TargetFrameworkId=$(TargetFrameworkId)"/>
3634

@@ -44,7 +42,7 @@
4442
<TempContent Include="$(ArtifactsRoot)/tmp"/>
4543
<TempContent Include="$(MDDocFolder)"/>
4644
</ItemGroup>
47-
<DeleteTree Directories="@(TempContent)"/>
45+
<RemoveDir Directories="@(TempContent)"/>
4846
</Target>
4947

5048
<Target Name="PrepareArtifactsRoot">
@@ -124,14 +122,14 @@
124122

125123
<MakeDir Directories="$(LibFolder)" />
126124
<CallTarget Targets="InstallStdLib" Condition="'$(StandardLibraryPacks)' != ''"/>
127-
<DeleteTree Directories="$(LibFolder)/opm" />
125+
<RemoveDir Directories="$(LibFolder)/opm" />
128126

129127
<Exec Command="&quot;$(ToolFolder)/oscript.exe&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)\install\opm.ospx&quot; &quot;$(LibFolder)\tmp&quot;"/>
130128
<Exec Command="&quot;$(ToolFolder)/oscript.exe&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; unpack &quot;$(LibFolder)\tmp\content.zip&quot; &quot;$(LibFolder)/opm&quot;"/>
131129

132130
<Copy SourceFiles="$(MSBuildProjectDirectory)\install\package-loader.os" DestinationFolder="$(LibFolder)"/>
133131

134-
<DeleteTree Directories="$(LibFolder)\tmp"/>
132+
<RemoveDir Directories="$(LibFolder)\tmp"/>
135133

136134
</Target>
137135

src/OneScriptDocumenter/AssemblyLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public AssemblyLoader(string baseDirectory)
5858
_enumerationTypeAttribute = scriptEngineLib.GetType("ScriptEngine.EnumerationTypeAttribute", true);
5959
_enumValue = scriptEngineLib.GetType("ScriptEngine.EnumItemAttribute", true);
6060

61-
foreach (var name in new string[] { "ScriptEngine.HostedScript", "DotNetZip", "Newtonsoft.Json" })
61+
foreach (var name in new string[] { "ScriptEngine.HostedScript", "ProDotNetZip", "Newtonsoft.Json" })
6262
{
6363
var libFile = Path.Combine(_baseDirectory, name + ".dll");
6464
if (File.Exists(libFile))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetZip" version="1.11.0" targetFramework="net45" />
3+
<package id="ProDotNetZip" version="1.20.0" targetFramework="net45" />
44
<package id="MarkdownDeep.NET" version="1.5" targetFramework="net45" />
55
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
66
</packages>

tests/native-api/AddInNative.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<ProjectGuid>{55890DF2-D13E-4C89-A01D-79CAD6726246}</ProjectGuid>
2323
<RootNamespace>testCPP</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2625
</PropertyGroup>
2726
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2827
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

0 commit comments

Comments
 (0)