Skip to content

Commit ff099a0

Browse files
viogrozaviogroza
committed
Python: Remove support for Legacy (25.6) [STUD-74234]
Remove support for Net461 Remove support for Python 2.7, 3.4 and 3.5
1 parent af939e6 commit ff099a0

File tree

16 files changed

+19
-119
lines changed

16 files changed

+19
-119
lines changed

‎Activities/Python/3rdparty/Python.Runtime.27.dll

-168 KB
Binary file not shown.

‎Activities/Python/3rdparty/Python.Runtime.34.dll

-170 KB
Binary file not shown.

‎Activities/Python/3rdparty/Python.Runtime.35.dll

-170 KB
Binary file not shown.

‎Activities/Python/3rdparty/x64/Python.Runtime.27.dll

-168 KB
Binary file not shown.

‎Activities/Python/3rdparty/x64/Python.Runtime.34.dll

-169 KB
Binary file not shown.

‎Activities/Python/3rdparty/x64/Python.Runtime.35.dll

-169 KB
Binary file not shown.

‎Activities/Python/UiPath.Python.Activities.Design/UiPath.Python.Activities.Design.csproj

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="Current">
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows</TargetFrameworks>
55
<OutputPath>$(ProjectDir)..\..\Output\Activities\Python\</OutputPath>
66
<UseWPF>true</UseWPF>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -10,17 +10,6 @@
1010
<PackageReference Include="UiPath.Workflow" />
1111
<PackageReference Include="System.Activities.Core.Presentation" />
1212
</ItemGroup>
13-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
14-
<Reference Include="System.Activities" />
15-
<Reference Include="System.Activities.Core.Presentation" />
16-
<Reference Include="System.Activities.Presentation" />
17-
<Reference Include="System.ServiceModel" />
18-
<Reference Include="System.Xaml" />
19-
<Reference Include="WindowsBase" />
20-
<Reference Include="PresentationCore" />
21-
<Reference Include="PresentationFramework" />
22-
</ItemGroup>
23-
2413
<!--<PropertyGroup>
2514
<PreBuildEvent>"$(ProjectDir)..\..\Tools\localization_utilities\dist\synchronize_localization.exe" "$(ProjectDir)\" "$(ProjectName)</PreBuildEvent>
2615
</PropertyGroup>-->

‎Activities/Python/UiPath.Python.Activities/UiPath.Python.Activities.csproj

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
44
<PackageId>.noconflict</PackageId>
5-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
<OutputPath>..\..\Output\Activities\Python\</OutputPath>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>
@@ -11,15 +11,6 @@
1111
</PropertyGroup>-->
1212
<Import Project="..\..\Shared\UiPath.Shared.Activities\UiPath.Shared.Activities.projitems" Label="Shared" />
1313
<Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
15-
<Reference Include="System.ServiceModel" />
16-
<Reference Include="System.Xaml" />
17-
<Reference Include="System.Data.DataSetExtensions" />
18-
<Reference Include="Microsoft.CSharp" />
19-
<Reference Include="System.Net.Http" />
20-
<Reference Include="System.Web.Services" />
21-
<Reference Include="System.Activities" />
22-
</ItemGroup>
2314
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
2415
<PackageReference Include="UiPath.Workflow" />
2516
</ItemGroup>

‎Activities/Python/UiPath.Python.Host/UiPath.Python.Host.csproj

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="Current">
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0-windows;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net6.0</TargetFrameworks>
55
<RollForward>Major</RollForward>
66
<OutputPath>..\..\Output\Activities\Python\</OutputPath>
77
<OutputType>Exe</OutputType>
@@ -15,22 +15,11 @@
1515
<StartupObject />
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net461|AnyCPU'">
19-
<PlatformTarget>x64</PlatformTarget>
20-
</PropertyGroup>
2118
<Import Project="..\..\Shared\UiPath.Shared.Service\UiPath.Shared.Service.projitems" Label="Shared" />
2219
<Import Project="..\UiPath.Python.Host.Shared\UiPath.Python.Host.Shared.projitems" Label="Shared" />
2320
<Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
2421

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
26-
<Reference Include="System.ServiceModel" />
27-
<Reference Include="System.Xaml" />
28-
<Reference Include="System.Data.DataSetExtensions" />
29-
<Reference Include="Microsoft.CSharp" />
30-
<Reference Include="System.Deployment" />
31-
<Reference Include="System.Net.Http" />
32-
</ItemGroup>
33-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
22+
<ItemGroup>
3423
<PackageReference Include="UiPath.Workflow" />
3524
</ItemGroup>
3625
<ItemGroup>

‎Activities/Python/UiPath.Python.Host32/UiPath.Python.Host32.csproj

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="Current">
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0-windows;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net6.0</TargetFrameworks>
55
<RollForward>Major</RollForward>
66
<OutputPath>..\..\Output\Activities\Python\</OutputPath>
77
<OutputType>Exe</OutputType>
@@ -19,15 +19,7 @@
1919
<Import Project="..\UiPath.Python.Host.Shared\UiPath.Python.Host.Shared.projitems" Label="Shared" />
2020
<Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
2121

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
23-
<Reference Include="System.ServiceModel" />
24-
<Reference Include="System.Xaml" />
25-
<Reference Include="System.Data.DataSetExtensions" />
26-
<Reference Include="Microsoft.CSharp" />
27-
<Reference Include="System.Deployment" />
28-
<Reference Include="System.Net.Http" />
29-
</ItemGroup>
30-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
22+
<ItemGroup>
3123
<PackageReference Include="UiPath.Workflow" />
3224
</ItemGroup>
3325
<ItemGroup>

‎Activities/Python/UiPath.Python.Packaging/UiPath.Python.Packaging.csproj

+9-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0-windows;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net6.0</TargetFrameworks>
55
<OutputPath>$(ProjectDir)..\..\Output\Activities\Python\</OutputPath>
66
<VersionSuffix></VersionSuffix>
77
<!--leave empty for ci to replace with prelease tag-->
@@ -29,15 +29,12 @@
2929
</Target>
3030

3131
<ItemGroup>
32-
<None Include="..\3rdparty\Python.Runtime*.dll" Pack="true" PackagePath="bin\net461\x86" />
33-
<None Include="..\3rdparty\Python.Runtime*.dll" Exclude="**\*.27.dll;**\*.34.dll;**\*.35.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\x86" />
34-
<None Include="..\3rdparty\Python.Runtime*.dll" Exclude="**\*.27.dll;**\*.34.dll;**\*.35.dll" Pack="true" PackagePath="bin\net6.0\x86" />
32+
<None Include="..\3rdparty\Python.Runtime*.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\x86" />
33+
<None Include="..\3rdparty\Python.Runtime*.dll" Pack="true" PackagePath="bin\net6.0\x86" />
3534

36-
<None Include="..\3rdparty\x64\Python.Runtime*.dll" Pack="true" PackagePath="bin\net461\x64" />
37-
<None Include="..\3rdparty\x64\Python.Runtime*.dll" Exclude="**\*.27.dll;**\*.34.dll;**\*.35.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\x64" />
38-
<None Include="..\3rdparty\x64\Python.Runtime*.dll" Exclude="**\*.27.dll;**\*.34.dll;**\*.35.dll" Pack="true" PackagePath="bin\net6.0\x64" />
35+
<None Include="..\3rdparty\x64\Python.Runtime*.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\x64" />
36+
<None Include="..\3rdparty\x64\Python.Runtime*.dll" Pack="true" PackagePath="bin\net6.0\x64" />
3937

40-
<None Include="$(OutputPath)\net461\UiPath.Python.Host*.exe" Pack="true" PackagePath="bin\net461" />
4138
<None Include="$(OutputPath)\net6.0\UiPath.Python.Host*.*exe" Pack="true" PackagePath="bin\net6.0" />
4239
<None Include="$(OutputPath)\net6.0-windows\UiPath.Python.Host*.*exe" Pack="true" PackagePath="bin\net6.0-windows7.0" />
4340
<None Include="$(OutputPath)\net6.0\UiPath.Python.Host*.*dll" Pack="true" PackagePath="bin\net6.0" />
@@ -49,22 +46,9 @@
4946
<None Include="$(OutputPath)\net6.0\*.*dll" Pack="true" PackagePath="bin\net6.0" />
5047
<None Include="$(OutputPath)\net6.0-windows\*.*dll" Pack="true" PackagePath="bin\net6.0-windows7.0" />
5148

52-
<None Include="$(OutputPath)\net461\UiPath.Python.dll" Pack="true" PackagePath="bin\net461" />
5349
<None Include="$(OutputPath)\net6.0\UiPath.Python.dll" Pack="true" PackagePath="bin\net6.0" />
5450
<None Include="$(OutputPath)\net6.0-windows\UiPath.Python.dll" Pack="true" PackagePath="bin\net6.0-windows7.0" />
5551

56-
<None Include="$(OutputPath)\net461\ja\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\ja\UiPath.Python.resources.dll" />
57-
<None Include="$(OutputPath)\net461\ru\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\ru\UiPath.Python.resources.dll" />
58-
<None Include="$(OutputPath)\net461\de\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\de\UiPath.Python.resources.dll" />
59-
<None Include="$(OutputPath)\net461\es\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\es\UiPath.Python.resources.dll" />
60-
<None Include="$(OutputPath)\net461\es-MX\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\es-MX\UiPath.Python.resources.dll" />
61-
<None Include="$(OutputPath)\net461\ko\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\ko\UiPath.Python.resources.dll" />
62-
<None Include="$(OutputPath)\net461\pt\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\pt\UiPath.Python.resources.dll" />
63-
<None Include="$(OutputPath)\net461\pt-BR\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\pt-BR\UiPath.Python.resources.dll" />
64-
<None Include="$(OutputPath)\net461\tr\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\tr\UiPath.Python.resources.dll" />
65-
<None Include="$(OutputPath)\net461\zh-CN\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\zh-CN\UiPath.Python.resources.dll" />
66-
<None Include="$(OutputPath)\net461\zh-TW\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net461\zh-TW\UiPath.Python.resources.dll" />
67-
6852
<None Include="$(OutputPath)\net6.0-windows\fr\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\fr\UiPath.Python.resources.dll" />
6953
<None Include="$(OutputPath)\net6.0-windows\ja\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\ja\UiPath.Python.resources.dll" />
7054
<None Include="$(OutputPath)\net6.0-windows\ru\UiPath.Python.resources.dll" Pack="true" PackagePath="bin\net6.0-windows7.0\ru\UiPath.Python.resources.dll" />
@@ -126,7 +110,7 @@
126110

127111
</ItemGroup>
128112

129-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
113+
<ItemGroup>
130114
<BuildOutputInPackage Include="$(OutputPath)UiPath.Python.Activities.ViewModels.dll" />
131115
</ItemGroup>
132116

@@ -148,7 +132,7 @@
148132
</ItemGroup>
149133
</Target>
150134

151-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
135+
<ItemGroup>
152136
<ProjectReference Include="..\..\Python\UiPath.Python.Activities.ViewModels\UiPath.Python.Activities.ViewModels.csproj">
153137
<PrivateAssets>All</PrivateAssets>
154138
</ProjectReference>
@@ -165,11 +149,11 @@
165149
</ProjectReference>
166150
</ItemGroup>
167151

168-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
152+
<ItemGroup>
169153
<PackageReference Include="System.Activities.ViewModels"/>
170154
</ItemGroup>
171155

172-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net461' AND $(ConfigurationName) == Debug ">
156+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net6.0' AND $(ConfigurationName) == Debug ">
173157
<Exec Command="if exist &quot;$(ProjectDir)..\..\Output\Activities\Packages\UiPath.Python.*&quot; del &quot;$(ProjectDir)..\..\Output\Activities\Packages\UiPath.Python.*&quot;&#xD;&#xA;&#xD;&#xA;&quot;powershell.exe&quot; -file &quot;$(ProjectDir)..\..\Tools\net.sdk\pack-project.ps1&quot; -projectPath &quot;$(ProjectPath)&quot; -outputPath &quot;$(ProjectDir)..\..\Output\Activities\Packages&quot; -suffix &quot;dev&quot;" />
174158
</Target>
175159
</Project>

‎Activities/Python/UiPath.Python.Tests/Runtimes.cs

-25
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,6 @@ public class Runtimes
8080
public static IEnumerable<object[]> X86Engines =>
8181
new List<object[]>
8282
{
83-
new object[]
84-
{
85-
@"C:\Python\python27-x86",
86-
Version.Python_27
87-
},
88-
new object[]
89-
{
90-
@"C:\Python\python34-x86",
91-
Version.Python_34
92-
},
93-
new object[]
94-
{
95-
@"C:\Python\python35-x86",
96-
Version.Python_35
97-
},
9883
new object[]
9984
{
10085
@"C:\Python\python36-x86",
@@ -120,16 +105,6 @@ public class Runtimes
120105
public static IEnumerable<object[]> X64Engines =>
121106
new List<object[]>
122107
{
123-
new object[]
124-
{
125-
@"C:\Python\python27-x64",
126-
Version.Python_27
127-
},
128-
new object[]
129-
{
130-
@"C:\Python\python35-x64",
131-
Version.Python_35
132-
},
133108
new object[]
134109
{
135110
@"C:\Python\python36-x64",

‎Activities/Python/UiPath.Python.Tests/UiPath.Python.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{9E913818-9270-4570-A8F4-80812EBFA09E}</ProjectGuid>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AssemblyTitle>UiPath.Python.Tests</AssemblyTitle>
66
<Product>UiPath.Python.Tests</Product>
77
<Copyright>Copyright © 2018</Copyright>
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>UiPath.Python.Tests</RootNamespace>
1515
<AssemblyName>UiPath.Python.Tests</AssemblyName>
16-
<TargetFrameworks>net461</TargetFrameworks>
16+
<TargetFrameworks>net6.0</TargetFrameworks>
1717
<OutputPath>..\..\OutputTests\Python\</OutputPath>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Any CPU' ">

‎Activities/Python/UiPath.Python/UiPath.Python.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
22
<Import Project="..\Python.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<OutputPath>..\..\Output\Activities\Python\</OutputPath>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
@@ -10,13 +10,6 @@
1010
</PropertyGroup>-->
1111
<Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
1212
<Import Project="..\..\Shared\UiPath.Shared.Service\UiPath.Shared.Service.projitems" Label="Shared" />
13-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
14-
<Reference Include="System.ServiceModel" />
15-
<Reference Include="System.Xaml" />
16-
<Reference Include="System.Data.DataSetExtensions" />
17-
<Reference Include="Microsoft.CSharp" />
18-
<Reference Include="System.Net.Http" />
19-
</ItemGroup>
2013
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
2114
<PackageReference Include="UiPath.Workflow" />
2215
</ItemGroup>

‎Activities/Python/UiPath.Python/Version.cs

-13
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,6 @@ public enum Version
4949
//Unknown = -1,
5050
[LocalizedDescription(nameof(Resources.Activity_PythonScope_Property_Auto_Description))]
5151
Auto,
52-
#if NET461
53-
[Version(2, 7, "Python.Runtime.27.dll")]
54-
[Description("Python 2.7")]
55-
Python_27,
56-
57-
[Version(3, 4, "Python.Runtime.34.dll")]
58-
[Description("Python 3.4")]
59-
Python_34,
60-
61-
[Version(3, 5, "Python.Runtime.35.dll")]
62-
[Description("Python 3.5")]
63-
Python_35,
64-
#endif
6552
[Version(3, 6, "Python.Runtime.36.dll")]
6653
[Description("Python 3.6")]
6754
Python_36,

‎Activities/Shared/UiPath.TestUtils/UiPath.TestUtils.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{D2C94889-1E86-4ABD-9D5E-631B3463DA86}</ProjectGuid>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AssemblyTitle>UiPath.TestUtils</AssemblyTitle>
66
<Product>UiPath.TestUtils</Product>
77
<Copyright>Copyright © 2018</Copyright>

0 commit comments

Comments
 (0)