Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .NET 6/.NET Core 3.1 targets #1342

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
using System.Linq;
using System.Collections.Generic;
using System.Collections.ObjectModel;
#if !NET462
using Nancy.Json;
#else
using System.Web.Script.Serialization;
#endif
using Newtonsoft.Json;
using Microsoft.ApplicationInsights.DataContracts;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,135 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AFCB5BB5-4512-4019-A911-5D56CFF4F3D0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Dynamics365.UIAutomation.Api.UCI</RootNamespace>
<AssemblyName>Microsoft.Dynamics365.UIAutomation.Api.UCI</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PropertyGroup>
<TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.ApplicationInsights, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ApplicationInsights.2.11.0\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Otp.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=38a48df817e173a6, processorArchitecture=MSIL">
<HintPath>..\packages\Otp.NET.1.2.1\lib\net45\Otp.NET.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
</Reference>
<Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controls\CompositeControl.cs" />
<Compile Include="Controls\DateTimeControl.cs" />
<Compile Include="Controls\Field.cs" />
<Compile Include="Controls\LookupItem.cs" />
<Compile Include="Controls\MultiValueOptionSet.cs" />
<Compile Include="Controls\BooleanItem.cs" />
<Compile Include="Controls\OptionSet.cs" />
<Compile Include="DTO\FormNotification.cs" />
<Compile Include="DTO\FormContextType.cs" />
<Compile Include="DTO\FormNotificationType.cs" />
<Compile Include="DTO\KeyPerformanceIndicator.cs" />
<Compile Include="Elements\BusinessProcessFlow.cs" />
<Compile Include="Elements\CommandBar.cs" />
<Compile Include="Elements\Subgrid.cs" />
<Compile Include="Elements\Telemetry.cs" />
<Compile Include="Elements\Dashboard.cs" />
<Compile Include="Elements\Dialog.cs" />
<Compile Include="Elements\Entity.cs" />
<Compile Include="Elements\GlobalSearch.cs" />
<Compile Include="Elements\Lookup.cs" />
<Compile Include="Elements\Grid.cs" />
<Compile Include="Elements\QuickCreate.cs" />
<Compile Include="Elements\OnlineLogin.cs" />
<Compile Include="Elements\Navigation.cs" />
<Compile Include="Elements\RelatedGrid.cs" />
<Compile Include="Elements\Timeline.cs" />
<Compile Include="LoginRedirectEventArgs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebClient.cs" />
<Compile Include="XrmApp.cs" />
<Compile Include="DTO\AppElementReference.cs" />
<Compile Include="DTO\ElementReference.cs" />
<Compile Include="DTO\GridItem.cs" />
<Compile Include="DTO\ListItem.cs" />
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj" />
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Otp.NET" Version="1.2.2" />
<PackageReference Include="Selenium.Support" Version="4.5.1" />
<PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5">
<IncludeAssets>none</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Buffers" Version="4.5.1">
<IncludeAssets>none</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj">
<Project>{dfe2c141-f1aa-4d4b-8df8-0fb93023cf45}</Project>
<Name>Microsoft.Dynamics365.UIAutomation.Api</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj">
<Project>{c9748803-f3cb-4531-b313-bc24d4d0bf0c}</Project>
<Name>Microsoft.Dynamics365.UIAutomation.Browser</Name>
</ProjectReference>
<Compile Remove="Controls\CrmControls.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
12 changes: 0 additions & 12 deletions Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,136 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DFE2C141-F1AA-4D4B-8DF8-0FB93023CF45}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Dynamics365.UIAutomation.Api</RootNamespace>
<AssemblyName>Microsoft.Dynamics365.UIAutomation.Api</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile />
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
</Reference>
<Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controls\CompositeControl.cs" />
<Compile Include="Controls\Field.cs" />
<Compile Include="Controls\LookupItem.cs" />
<Compile Include="Controls\MultiValueOptionSet.cs" />
<Compile Include="Controls\DateTimeControl.cs" />
<Compile Include="Controls\TwoOption.cs" />
<Compile Include="Controls\OptionSet.cs" />
<Compile Include="DTOs\PerformanceNavigationTiming.cs" />
<Compile Include="DTOs\PerformanceResource.cs" />
<Compile Include="DTOs\AppNotification.cs" />
<Compile Include="DTOs\ElementReference.cs" />
<Compile Include="DTOs\GridItem.cs" />
<Compile Include="DTOs\InstanceInfo.cs" />
<Compile Include="DTOs\Link.cs" />
<Compile Include="DTOs\ListItem.cs" />
<Compile Include="DTOs\PerformanceMarker.cs" />
<Compile Include="LoginRedirectEventArgs.cs" />
<Compile Include="Office365Browser.cs" />
<Compile Include="Pages\Office365.cs" />
<Compile Include="Pages\WindowPerformanceNavigation.cs" />
<Compile Include="Pages\Administration.cs" />
<Compile Include="Pages\Dashboard.cs" />
<Compile Include="Pages\GlobalSearch.cs" />
<Compile Include="Pages\LoginDialog.cs" />
<Compile Include="Pages\Office365Navigation.cs" />
<Compile Include="Pages\Office365XrmInstancePicker.cs" />
<Compile Include="Pages\CommandBar.cs" />
<Compile Include="Pages\Dialog.cs" />
<Compile Include="Pages\Entity.cs" />
<Compile Include="Pages\Grid.cs" />
<Compile Include="Pages\GuidedHelp.cs" />
<Compile Include="Pages\Lookup.cs" />
<Compile Include="Pages\Mobile.cs" />
<Compile Include="Pages\Navigation.cs" />
<Compile Include="Pages\BusinessProcessFlow.cs" />
<Compile Include="Pages\Notfication.cs" />
<Compile Include="Pages\PerformanceCenter.cs" />
<Compile Include="Pages\Processes.cs" />
<Compile Include="Pages\QuickCreate.cs" />
<Compile Include="Pages\Document.cs" />
<Compile Include="Pages\ActivityFeed.cs" />
<Compile Include="Pages\RelatedGrid.cs" />
<Compile Include="Pages\Report.cs" />
<Compile Include="Pages\WindowPerformanceResource.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReportEventArgs.cs" />
<Compile Include="Browser.cs" />
<Compile Include="XrmPage.cs" />
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Selenium.Support" Version="4.5.1" />
<PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Nancy" Version="2.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Web.Extensions" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj">
<Project>{c9748803-f3cb-4531-b313-bc24d4d0bf0c}</Project>
<Name>Microsoft.Dynamics365.UIAutomation.Browser</Name>
</ProjectReference>
<Compile Remove="Controls\CrmControls.cs" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

#if !NET462
using Nancy.Json;
#else
using System.Web.Script.Serialization;
#endif
using Microsoft.Dynamics365.UIAutomation.Browser;
using Newtonsoft.Json.Linq;
using OpenQA.Selenium;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web.Script.Serialization;

namespace Microsoft.Dynamics365.UIAutomation.Api
{
Expand Down Expand Up @@ -110,7 +114,7 @@ public BrowserCommandResult<Dictionary<string, object>> GetMarkersRaw()

jsSerializer.RegisterConverters(new[] { new DynamicJsonConverter() });

var jsonObj = (Dictionary<string, object>)jsSerializer.Deserialize(jsonResults, typeof(Dictionary<string, object>));
var jsonObj = (Dictionary<string, object>)jsSerializer.Deserialize<Dictionary<string, object>>(jsonResults);

return jsonObj;
});
Expand Down
8 changes: 0 additions & 8 deletions Microsoft.Dynamics365.UIAutomation.Api/packages.config

This file was deleted.

Loading