Skip to content

Commit dfc25ef

Browse files
author
Justin Marks
authored
Merge pull request #22 from phatcher/vs2017
Convert projects to package reference
2 parents e313e94 + dff1614 commit dfc25ef

File tree

16 files changed

+176
-663
lines changed

16 files changed

+176
-663
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
33
################################################################################
44

5+
.vs/
6+
_ReSharper.Caches/
57

68
*.suo
79
packages/

‎ClientLibraryConsoleAppSample/ClientLibraryConsoleAppSample.csproj

Lines changed: 5 additions & 194 deletions
Large diffs are not rendered by default.

‎ClientLibraryConsoleAppSample/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Microsoft.TeamFoundation.WorkItemTracking.WebApi;
1+
using System;
2+
using System.Linq;
3+
4+
using Microsoft.TeamFoundation.WorkItemTracking.WebApi;
25
using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
36
using Microsoft.VisualStudio.Services.Client;
4-
using Microsoft.VisualStudio.Services.Common;
57
using Microsoft.VisualStudio.Services.WebApi;
6-
using System;
7-
using System.Linq;
88

99
namespace ClientLibraryConsoleAppSample
1010
{

‎ClientLibraryConsoleAppSample/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎ClientLibraryConsoleAppSample/packages.config

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎DeviceProfileSample/DeviceProfileSample.csproj

Lines changed: 10 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4B81F1A9-4A60-4793-ABEE-85546AAA480E}</ProjectGuid>
83
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>net452</TargetFramework>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
106
<RootNamespace>DeviceProfileSample</RootNamespace>
117
<AssemblyName>DeviceProfileSample</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
348
</PropertyGroup>
359
<ItemGroup>
36-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.16.0.14, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37-
<HintPath>packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.16.0.14, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
10+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.16.0" />
11+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
12+
</ItemGroup>
13+
<ItemGroup>
14+
<Reference Include="Microsoft.CSharp" />
4615
<Reference Include="System" />
4716
<Reference Include="System.Core" />
48-
<Reference Include="System.Xml.Linq" />
49-
<Reference Include="System.Data.DataSetExtensions" />
50-
<Reference Include="Microsoft.CSharp" />
5117
<Reference Include="System.Data" />
18+
<Reference Include="System.Data.DataSetExtensions" />
5219
<Reference Include="System.Net.Http" />
5320
<Reference Include="System.Xml" />
21+
<Reference Include="System.Xml.Linq" />
5422
</ItemGroup>
55-
<ItemGroup>
56-
<Compile Include="Program.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<None Include="App.config" />
61-
<None Include="packages.config" />
62-
</ItemGroup>
63-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
65-
Other similar extension points exist, see Microsoft.Common.targets.
66-
<Target Name="BeforeBuild">
67-
</Target>
68-
<Target Name="AfterBuild">
69-
</Target>
70-
-->
7123
</Project>

‎DeviceProfileSample/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎DeviceProfileSample/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎ManagedClientConsoleAppSample/ManagedClientConsoleAppSample.csproj

Lines changed: 14 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{755BC9EF-A095-48DC-BBF6-AF39F8C3363E}</ProjectGuid>
83
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>net452</TargetFramework>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
106
<RootNamespace>ManagedClientConsoleAppSample</RootNamespace>
117
<AssemblyName>ManagedClientConsoleAppSample</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<PropertyGroup>
36-
<StartupObject>ManagedClientConsoleAppSample.Program</StartupObject>
378
</PropertyGroup>
389
<ItemGroup>
39-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.13.8.999, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.13.8.999, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>packages\WindowsAzure.ServiceBus.3.3.2\lib\net45-full\Microsoft.ServiceBus.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.TeamFoundation.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
51-
<HintPath>packages\Microsoft.VisualStudio.Services.Client.15.112.1\lib\net45\Microsoft.TeamFoundation.Common.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Microsoft.VisualStudio.Services.Client.Interactive, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
54-
<HintPath>packages\Microsoft.VisualStudio.Services.InteractiveClient.15.112.1\lib\net45\Microsoft.VisualStudio.Services.Client.Interactive.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Microsoft.VisualStudio.Services.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57-
<HintPath>packages\Microsoft.VisualStudio.Services.Client.15.112.1\lib\net45\Microsoft.VisualStudio.Services.Common.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Microsoft.VisualStudio.Services.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60-
<HintPath>packages\Microsoft.VisualStudio.Services.Client.15.112.1\lib\net45\Microsoft.VisualStudio.Services.WebApi.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
63-
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
10+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.13.8" />
11+
<PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="15.112.1" />
12+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<Reference Include="Microsoft.CSharp" />
6616
<Reference Include="System" />
6717
<Reference Include="System.Core" />
68-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
73-
</Reference>
74-
<Reference Include="System.Runtime.Serialization" />
75-
<Reference Include="System.ServiceModel" />
76-
<Reference Include="System.Xml.Linq" />
77-
<Reference Include="System.Data.DataSetExtensions" />
78-
<Reference Include="Microsoft.CSharp" />
7918
<Reference Include="System.Data" />
19+
<Reference Include="System.Data.DataSetExtensions" />
8020
<Reference Include="System.Net.Http" />
21+
<Reference Include="System.Runtime.Serialization" />
22+
<Reference Include="System.ServiceModel" />
8123
<Reference Include="System.Xml" />
82-
</ItemGroup>
83-
<ItemGroup>
84-
<Compile Include="Program.cs" />
85-
<Compile Include="Properties\AssemblyInfo.cs" />
86-
</ItemGroup>
87-
<ItemGroup>
88-
<None Include="App.config">
89-
<SubType>Designer</SubType>
90-
</None>
91-
<None Include="packages.config">
92-
<SubType>Designer</SubType>
93-
</None>
94-
</ItemGroup>
95-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
97-
Other similar extension points exist, see Microsoft.Common.targets.
98-
<Target Name="BeforeBuild">
99-
</Target>
100-
<Target Name="AfterBuild">
101-
</Target>
102-
-->
24+
<Reference Include="System.Xml.Linq" />
25+
</ItemGroup>
10326
</Project>

‎ManagedClientConsoleAppSample/Program.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using Microsoft.IdentityModel.Clients.ActiveDirectory;
2-
using System;
1+
using System;
32
using System.Linq;
43
using System.Net.Http;
54
using System.Net.Http.Headers;
6-
using Microsoft.VisualStudio.Services.Client;
7-
using Microsoft.VisualStudio.Services.WebApi;
5+
6+
using Microsoft.IdentityModel.Clients.ActiveDirectory;
87

98
namespace ManagedClientConsoleAppSample
109
{

0 commit comments

Comments
 (0)