Skip to content

Commit 4a6cf2a

Browse files
committed
convert to PackageReference + ref latest version
1 parent b2ef087 commit 4a6cf2a

File tree

14 files changed

+115
-206
lines changed

14 files changed

+115
-206
lines changed

.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
22
[Bb]in/
33
[Oo]bj/
4+
.idea/
5+
.vs/
46

57
# mstest test results
68
TestResults
@@ -12,7 +14,7 @@ TestResults
1214
*.suo
1315
*.user
1416
*.sln.docstates
15-
.vs/
17+
*.secrets.cs
1618

1719
# Build results
1820
[Dd]ebug/
@@ -100,6 +102,7 @@ ClientBin
100102
[Ss]tyle[Cc]op.*
101103
~$*
102104
*.dbmdl
105+
103106
Generated_Code #added for RIA/Silverlight projects
104107

105108
# Backup & report files from converting an old project file to a newer
@@ -114,4 +117,4 @@ ssl/
114117
*.pem
115118
results/
116119
teststub.*
117-
*.sqlite
120+
*.sqlite

servers/Perf.ServiceInterface/Perf.ServiceInterface.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Perf.SeviceInterface</RootNamespace>
1111
<AssemblyName>Perf.SeviceInterface</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<LangVersion>default</LangVersion>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>

servers/Techempower.AspNet/Techempower.AspNet.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Techempower.AspNet</RootNamespace>
1515
<AssemblyName>Techempower.AspNet</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<IISExpressSSLPort />
1919
<IISExpressAnonymousAuthentication />
2020
<IISExpressWindowsAuthentication />
2121
<IISExpressUseClassicPipelineMode />
22+
<LangVersion>default</LangVersion>
2223
</PropertyGroup>
2324
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2425
<DebugSymbols>true</DebugSymbols>

servers/Techempower.HttpListener.Pool/Techempower.HttpListener.Pool.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Techempower.HttpListener.Pool</RootNamespace>
1111
<AssemblyName>Techempower.HttpListener.Pool</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>

servers/Techempower.HttpListener.SmartPool/Techempower.HttpListener.SmartPool.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Techempower.HttpListener.SmartPool</RootNamespace>
1111
<AssemblyName>Techempower.HttpListener.SmartPool</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>

servers/Techempower.HttpListener/Techempower.HttpListener.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Techempower.HttpListener</RootNamespace>
1111
<AssemblyName>Techempower.HttpListener</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>

servers/Techempower.SelfHost/Techempower.SelfHost.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Techempower.SelfHost</RootNamespace>
1111
<AssemblyName>Techempower.SelfHost</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>

servers/Techempower.ServiceInterface/Techempower.ServiceInterface.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Techempower.ServiceInterface</RootNamespace>
1111
<AssemblyName>Techempower.ServiceInterface</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>

src/BenchmarksAnalyzer.ServiceInterface/AuthenticatedServices.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ private TestPlan AddMissingLabels(TestPlan testPlan)
170170
if (testPlan.TestLabels == null)
171171
testPlan.TestLabels = new Dictionary<string, string>();
172172

173-
var serverLabels = distinctResults.ConvertAll(x => x.Hostname + ":" + x.Port).ToHashSet();
173+
var serverLabels = new HashSet<string>(distinctResults.Select(x => x.Hostname + ":" + x.Port));
174174
serverLabels.Each(x => {
175175
if (!testPlan.ServerLabels.ContainsKey(x))
176176
testPlan.ServerLabels[x] = "";
177177
});
178178

179-
var testLabels = distinctResults.ConvertAll(x => x.RequestPath).ToHashSet();
179+
var testLabels = new HashSet<string>(distinctResults.Select(x => x.RequestPath));
180180
testLabels.Each(x =>
181181
{
182182
if (!testPlan.TestLabels.ContainsKey(x))

src/BenchmarksAnalyzer.ServiceInterface/BenchmarksAnalyzer.ServiceInterface.csproj

+9-24
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>BenchmarksAnalyzer.ServiceInterface</RootNamespace>
1111
<AssemblyName>BenchmarksAnalyzer.ServiceInterface</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -30,28 +31,6 @@
3031
<WarningLevel>4</WarningLevel>
3132
</PropertyGroup>
3233
<ItemGroup>
33-
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
34-
<HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
35-
<Private>True</Private>
36-
</Reference>
37-
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
38-
<HintPath>..\packages\ServiceStack.5.0.0\lib\net45\ServiceStack.dll</HintPath>
39-
</Reference>
40-
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
41-
<HintPath>..\packages\ServiceStack.Client.5.0.0\lib\net45\ServiceStack.Client.dll</HintPath>
42-
</Reference>
43-
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
44-
<HintPath>..\packages\ServiceStack.Common.5.0.0\lib\net45\ServiceStack.Common.dll</HintPath>
45-
</Reference>
46-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
47-
<HintPath>..\packages\ServiceStack.Interfaces.5.0.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
48-
</Reference>
49-
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
50-
<HintPath>..\packages\ServiceStack.OrmLite.5.0.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
51-
</Reference>
52-
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
53-
<HintPath>..\packages\ServiceStack.Text.5.0.0\lib\net45\ServiceStack.Text.dll</HintPath>
54-
</Reference>
5534
<Reference Include="System" />
5635
<Reference Include="System.Core" />
5736
<Reference Include="System.Runtime.Serialization" />
@@ -78,7 +57,13 @@
7857
</ProjectReference>
7958
</ItemGroup>
8059
<ItemGroup>
81-
<None Include="packages.config" />
60+
<PackageReference Include="DotNetZip" Version="1.10.1" />
61+
<PackageReference Include="ServiceStack" Version="5.0.3" />
62+
<PackageReference Include="ServiceStack.Client" Version="5.0.3" />
63+
<PackageReference Include="ServiceStack.Common" Version="5.0.3" />
64+
<PackageReference Include="ServiceStack.Interfaces" Version="5.0.3" />
65+
<PackageReference Include="ServiceStack.OrmLite" Version="5.0.3" />
66+
<PackageReference Include="ServiceStack.Text" Version="5.0.3" />
8267
</ItemGroup>
8368
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8469
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

src/BenchmarksAnalyzer.ServiceModel/BenchmarksAnalyzer.ServiceModel.csproj

+5-8
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>BenchmarksAnalyzer.ServiceModel</RootNamespace>
1111
<AssemblyName>BenchmarksAnalyzer.ServiceModel</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<LangVersion>default</LangVersion>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -30,12 +31,6 @@
3031
<WarningLevel>4</WarningLevel>
3132
</PropertyGroup>
3233
<ItemGroup>
33-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
34-
<HintPath>..\packages\ServiceStack.Interfaces.5.0.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
35-
</Reference>
36-
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
37-
<HintPath>..\packages\ServiceStack.Text.5.0.0\lib\net45\ServiceStack.Text.dll</HintPath>
38-
</Reference>
3934
<Reference Include="System" />
4035
<Reference Include="System.Core" />
4136
<Reference Include="System.Xml.Linq" />
@@ -61,8 +56,10 @@
6156
<Compile Include="ViewTestPlan.cs" />
6257
</ItemGroup>
6358
<ItemGroup>
64-
<None Include="packages.config" />
59+
<PackageReference Include="ServiceStack.Interfaces" Version="5.0.3" />
60+
<PackageReference Include="ServiceStack.Text" Version="5.0.3" />
6561
</ItemGroup>
62+
6663
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6764
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6865
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)