Skip to content

Commit dfd08fe

Browse files
NickCraverNickCraver
committed
Centralized versioning and package updates
1 parent 50703d0 commit dfd08fe

11 files changed

+75
-56
lines changed

‎Directory.Packages.props

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449"/>
7+
<PackageVersion Include="BuildWebCompiler" Version="1.12.405" />
8+
<PackageVersion Include="Dapper" Version="2.1.35" />
9+
<PackageVersion Include="Enums.NET" Version="5.0.0" />
10+
<PackageVersion Include="Jil" Version="2.17.0" />
11+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
12+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
13+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
16+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
17+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
18+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
19+
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.10" />
20+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
21+
<PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
22+
<PackageVersion Include="MiniProfiler.Shared" Version="4.5.4" />
23+
<PackageVersion Include="Sigil" Version="5.0.0" />
24+
<PackageVersion Include="StackExchange.Exceptional.AspNetCore" Version="3.0.1" />
25+
<PackageVersion Include="StackExchange.Exceptional.Shared" Version="3.0.1" />
26+
<PackageVersion Include="StackExchange.Redis" Version="2.8.22" />
27+
<PackageVersion Include="StackExchange.Utils.Http" Version="0.3.48" />
28+
<PackageVersion Include="System.DirectoryServices" Version="8.0.0" />
29+
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
30+
<PackageVersion Include="System.Management" Version="8.0.0" />
31+
<PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
32+
<PackageVersion Include="xunit" Version="2.9.2" />
33+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<GlobalPackageReference Condition="'$(TargetFramework)'!='net462'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
37+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
38+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
39+
</ItemGroup>
40+
</Project>

‎Opserver.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29021.104
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35521.163 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opserver.Core", "src\Opserver.Core\Opserver.Core.csproj", "{C58AFF99-F4D9-4A83-866E-18DA0A633F6B}"
77
EndProject
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
appveyor.yml = appveyor.yml
1313
azure-pipelines.yml = azure-pipelines.yml
1414
Build.bat = Build.bat
15+
Directory.Packages.props = Directory.Packages.props
1516
global.json = global.json
1617
nuget.config = nuget.config
1718
readme.md = readme.md

‎nuget.config

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="MyGet: Stack Overflow" value="https://www.myget.org/F/stackoverflow/api/v3/index.json" />
65
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
76
</packageSources>
87
</configuration>

‎src/Directory.Build.props

-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,10 @@
1616
<DefaultLanguage>en-US</DefaultLanguage>
1717
<IncludeSymbols>false</IncludeSymbols>
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
19-
<!--<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>-->
2019
</PropertyGroup>
2120
<!-- File nesting! -->
2221
<ItemGroup>
2322
<ProjectCapability Include="DynamicDependentFile" />
2423
<ProjectCapability Include="DynamicFileNesting" />
2524
</ItemGroup>
26-
<ItemGroup>
27-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
29-
</ItemGroup>
3025
</Project>

‎src/Opserver.Core/Data/SQL/SQLAzureServer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Concurrent;
22
using System.Collections.Generic;
3-
using System.Data.SqlClient;
3+
using Microsoft.Data.SqlClient;
44

55
namespace Opserver.Data.SQL
66
{

‎src/Opserver.Core/Data/SQL/SQLInstance.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
44
using System.Data.Common;
5-
using System.Data.SqlClient;
65
using System.Runtime.CompilerServices;
76
using System.Threading.Tasks;
7+
using Microsoft.Data.SqlClient;
88
using Opserver.Helpers;
99

1010
namespace Opserver.Data.SQL

‎src/Opserver.Core/Helpers/Connection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Data;
33
using System.Data.Common;
4-
using System.Data.SqlClient;
54
using System.Threading;
65
using System.Threading.Tasks;
6+
using Microsoft.Data.SqlClient;
77
using StackExchange.Profiling;
88
using StackExchange.Profiling.Data;
99

‎src/Opserver.Core/Opserver.Core.csproj

+17-21
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,26 @@
77
<DebugType>embedded</DebugType>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Dapper" Version="2.1.35" />
11-
<PackageReference Include="Enums.NET" Version="5.0.0" />
12-
<PackageReference Include="Jil" Version="2.17.0" />
13-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
15-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
17-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.10" />
18-
<PackageReference Include="MiniProfiler.Shared" Version="4.3.13" />
19-
<PackageReference Include="Sigil" Version="5.0.0" />
20-
<PackageReference Include="StackExchange.Exceptional.Shared" Version="2.2.35" />
21-
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
22-
<PackageReference Include="StackExchange.Utils.Http" Version="0.3.48" />
23-
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
24-
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
25-
<PackageReference Include="System.Management" Version="8.0.0" />
26-
<PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
10+
<PackageReference Include="Dapper" />
11+
<PackageReference Include="Enums.NET" />
12+
<PackageReference Include="Jil" />
13+
<PackageReference Include="Microsoft.Data.SqlClient"/>
14+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
16+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
18+
<PackageReference Include="Microsoft.Net.Http.Headers" />
19+
<PackageReference Include="MiniProfiler.Shared" />
20+
<PackageReference Include="Sigil" />
21+
<PackageReference Include="StackExchange.Exceptional.Shared" />
22+
<PackageReference Include="StackExchange.Redis" />
23+
<PackageReference Include="StackExchange.Utils.Http" />
24+
<PackageReference Include="System.DirectoryServices" />
25+
<PackageReference Include="System.Management" />
26+
<PackageReference Include="System.Runtime.Caching" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<Compile Update="Data\SQL\QueryPlans\ShowPlanXML.cs" SubType="Code" />
3030
<Compile Update="Data\SQL\QueryPlans\ShowPlanXML.generated.cs" SubType="Code" />
3131
</ItemGroup>
32-
<ItemGroup>
33-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
34-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.143" />
35-
</ItemGroup>
3632
</Project>

‎src/Opserver.Web/Opserver.Web.csproj

+6-11
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\Opserver.Core\Opserver.Core.csproj" />
9-
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="all" />
10-
<PackageReference Include="BuildWebCompiler" Condition="'$(OS)' == 'Windows_NT'" Version="1.12.405" PrivateAssets="all" />
11-
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.13" />
12-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
13-
<PackageReference Include="StackExchange.Exceptional.AspNetCore" Version="2.2.35" />
14-
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
15-
<Reference Include="System.Management" />
9+
<PackageReference Include="BuildBundlerMinifier" PrivateAssets="all" />
10+
<PackageReference Include="BuildWebCompiler" Condition="'$(OS)' == 'Windows_NT'" PrivateAssets="all" />
11+
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
13+
<PackageReference Include="StackExchange.Exceptional.AspNetCore" />
14+
<PackageReference Include="System.DirectoryServices.AccountManagement" />
1615
</ItemGroup>
1716
<ItemGroup>
1817
<Content Include="Config\*.config.example" />
@@ -23,8 +22,4 @@
2322
<None Include="Config\*.example.json" />
2423
<None Include="compilerconfig.json" />
2524
</ItemGroup>
26-
<ItemGroup>
27-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
28-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.143" />
29-
</ItemGroup>
3025
</Project>

‎tests/Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
9-
<PackageReference Include="xunit" Version="$(xUnitVersion)" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitVersion)" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="xunit" />
10+
<PackageReference Include="xunit.runner.visualstudio" />
1111
</ItemGroup>
1212
</Project>

‎tests/Opserver.Tests/Opserver.Tests.csproj

+3-10
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="../../src/Opserver.Web/Opserver.Web.csproj" />
9-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14-
<PackageReference Update="xunit" Version="2.9.2" />
15-
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
9+
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
11+
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
1912
</ItemGroup>
2013
</Project>

0 commit comments

Comments
 (0)