diff --git a/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj b/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj index 1ae82d7c6..0e853e932 100644 --- a/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj +++ b/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj @@ -23,6 +23,35 @@ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> </PropertyGroup> + <ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' "> + <ProjectReference Include="..\..\Cryptography\UiPath.Cryptography.Activities.Design\UiPath.Cryptography.Activities.Design.csproj"> + <PrivateAssets>All</PrivateAssets> + </ProjectReference> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> + <ProjectReference Include="..\..\Cryptography\UiPath.Cryptography.Activities\UiPath.Cryptography.Activities.csproj"> + <PrivateAssets>All</PrivateAssets> + </ProjectReference> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> + <PackageReference Include="System.Security.Cryptography.Cng" /> + <PackageReference Include="System.Formats.Asn1" /> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> + <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" /> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' != 'net461' "> + <PackageReference Include="System.Activities.ViewModels" /> + </ItemGroup> + + <ItemGroup> + <PackageReference Include="UiPath.Platform" /> + </ItemGroup> + <Target Name="RemoveMetaDll" AfterTargets="BuiltProjectOutputGroup"> <ItemGroup> <BuiltProjectOutputGroupOutput Remove="@(BuiltProjectOutputGroupOutput)" /> @@ -63,7 +92,7 @@ <BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Cryptography.Activities.resources.dll" TargetPath="pt-BR\UiPath.Cryptography.Activities.resources.dll" /> <BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Cryptography.Activities.resources.dll" TargetPath="tr\UiPath.Cryptography.Activities.resources.dll" /> <BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Cryptography.Activities.resources.dll" TargetPath="zh-CN\UiPath.Cryptography.Activities.resources.dll" /> - <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.Activities.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.Activities.resources.dll" /> + <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.Activities.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.Activities.resources.dll" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' "> <BuildOutputInPackage Include="$(OutputPath)UiPath.Cryptography.Activities.Design.dll" /> @@ -79,36 +108,15 @@ <BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Cryptography.Activities.Design.resources.dll" TargetPath="pt-BR\UiPath.Cryptography.Activities.Design.resources.dll" /> <BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Cryptography.Activities.Design.resources.dll" TargetPath="tr\UiPath.Cryptography.Activities.Design.resources.dll" /> <BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Cryptography.Activities.Design.resources.dll" TargetPath="zh-CN\UiPath.Cryptography.Activities.Design.resources.dll" /> - <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.Activities.Design.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.Activities.Design.resources.dll" /> + <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.Activities.Design.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.Activities.Design.resources.dll" /> </ItemGroup> </Target> + <Target Name="CleanPackageFiles" BeforeTargets="Build"> - <Message Text="Deleting packages ..." /> - <ItemGroup> - <PackageFilesToDelete Include="$(PackageOutputPath)\$(PackageId)*.nupkg" /> - </ItemGroup> - <Delete Files="@(PackageFilesToDelete)" ContinueOnError="WarnAndContinue" /> + <Message Text="Deleting packages ..." /> + <ItemGroup> + <PackageFilesToDelete Include="$(PackageOutputPath)\$(PackageId)*.nupkg" /> + </ItemGroup> + <Delete Files="@(PackageFilesToDelete)" ContinueOnError="WarnAndContinue" /> </Target> - - <ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' "> - <ProjectReference Include="..\..\Cryptography\UiPath.Cryptography.Activities.Design\UiPath.Cryptography.Activities.Design.csproj"> - <PrivateAssets>All</PrivateAssets> - </ProjectReference> - </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> - <ProjectReference Include="..\..\Cryptography\UiPath.Cryptography.Activities\UiPath.Cryptography.Activities.csproj"> - <PrivateAssets>All</PrivateAssets> - </ProjectReference> - <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" /> - </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> - <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" /> - </ItemGroup> - - <ItemGroup Condition=" '$(TargetFramework)' != 'net461' "> - <PackageReference Include="System.Activities.ViewModels" /> - </ItemGroup> - <ItemGroup> - <PackageReference Include="UiPath.Platform" /> - </ItemGroup> </Project> \ No newline at end of file diff --git a/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj b/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj index 25b8946f2..8c6a3b42d 100644 --- a/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj +++ b/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj @@ -1,26 +1,33 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\Cryptography.build.props" /> + <PropertyGroup> <TargetFrameworks>net461;net6.0</TargetFrameworks> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <OutputPath>..\..\Output\Activities\Cryptography\</OutputPath> </PropertyGroup> + <Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" /> + <ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Xaml" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Net.Http" /> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' != 'net461' "> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> <PackageReference Include="UiPath.Workflow.Runtime" /> <PackageReference Include="UiPath.Workflow" /> + <PackageReference Include="System.Security.Cryptography.Cng" /> + <PackageReference Include="System.Formats.Asn1" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" /> - </ItemGroup> + <ItemGroup> <Compile Update="Properties\UiPath.Cryptography.Designer.cs"> <AutoGen>True</AutoGen> @@ -28,6 +35,7 @@ <DependentUpon>UiPath.Cryptography.resx</DependentUpon> </Compile> </ItemGroup> + <ItemGroup> <EmbeddedResource Update="Properties\UiPath.Cryptography.resx"> <Generator>ResXFileCodeGenerator</Generator> diff --git a/Activities/Directory.build.targets b/Activities/Directory.build.targets index b1dd0b4e9..395e9b5e7 100644 --- a/Activities/Directory.build.targets +++ b/Activities/Directory.build.targets @@ -1,4 +1,5 @@ <Project> + <ItemGroup Condition="$(TargetFramework.StartsWith('net6'))"> <PackageReference Update="UiPath.Workflow" Version="6.0.0-20220401-03" /> <PackageReference Update="UiPath.Workflow.Runtime" Version="6.0.0-20220401-03" /> @@ -7,23 +8,31 @@ <PackageReference Update="System.Activities.ViewModels" Version="1.0.0-20230713.1"/> <PackageReference Update="System.Activities" Version="5.0.0-20210615-01" /> </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> + <PackageReference Update="System.Security.Cryptography.Cng" Version="4.5.2" /> + <PackageReference Update="System.Formats.Asn1" Version="8.0.1" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net5'))"> <PackageReference Update="System.Activities" Version="5.0.0-20210615-01" /> <PackageReference Update="UiPath.Workflow" Version="5.0.0-20210615-01" /> <PackageReference Update="System.Activities.Core.Presentation" Version="5.0.0-20210724.1" /> <PackageReference Update="System.Activities.ViewModels" Version="1.0.0-20220307.1"/> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'"> <PackageReference Update="System.Activities" Version="1.0.0-20201105-02" /> <PackageReference Update="UiPath.Workflow" Version="1.0.0-20201105-02" /> <PackageReference Update="System.Activities.Core.Presentation" Version="1.0.0-alpha003" /> </ItemGroup> + <ItemGroup> <PackageReference Update="UiPath.Robot.Api" Version="22.10.2" PrivateAssets="All" /> <PackageReference Update="UiPath.Activities.Api" Version="22.10.2" PrivateAssets="All" /> <PackageReference Update="UiPath.Activities.Contracts" Version="22.10.2" PrivateAssets="All" /> <PackageReference Update="UiPath.Telemetry.Client" Version="1.5.3" PrivateAssets="All" /> - <PackageReference Update="UiPath.Platform" Version="22.10.2"/> + <PackageReference Update="UiPath.Platform" Version="24.10.3"/> </ItemGroup> <!-- the None element is used for keeping files visible in solution explorer -->