Skip to content
This repository has been archived by the owner on Jul 5, 2020. It is now read-only.

Add netstandard20 target for windowsserver project. tests are modifie… #1237

Merged
merged 2 commits into from
Jul 19, 2019
Merged

Add netstandard20 target for windowsserver project. tests are modifie… #1237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf8eba5
Add netstandard20 target for windowsserver project. tests are modifie…
cijothomas Jul 19, 2019
9548860
update changelog.
cijothomas Jul 19, 2019
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
4 changes: 2 additions & 2 deletions Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NetCore.props))\NetCore.props" />

Expand All @@ -10,7 +10,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
8 changes: 6 additions & 2 deletions Src/WindowsServer/WindowsServer/WindowsServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Microsoft.ApplicationInsights.WindowsServer</RootNamespace>
<AssemblyName>Microsoft.AI.WindowsServer</AssemblyName>
<DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net45;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -16,6 +16,10 @@
<PackageTags>Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' OR '$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);NETSTANDARD;</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Release' And $(OS) == 'Windows_NT'">
<!--Analyzers-->
<PackageReference Include="Desktop.Analyzers" Version="1.1.0">
Expand Down Expand Up @@ -43,7 +47,7 @@
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6' OR '$(TargetFramework)' == 'netstandard2.0'">
<!-- NetCore Dependencies -->
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
Expand Down