Skip to content

Commit f6d0adf

Browse files
BertkBertk
committed
update nuget versions using CPM
1 parent 33affd6 commit f6d0adf

File tree

21 files changed

+183
-167
lines changed

21 files changed

+183
-167
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1515
<LangVersion>preview</LangVersion>
1616
<NoWarn>$(NoWarn);NU5105;CS1591</NoWarn>
17+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1718
<RestoreSources>
1819
https://api.nuget.org/v3/index.json;
1920
</RestoreSources>
@@ -24,8 +25,4 @@
2425
<Deterministic>true</Deterministic>
2526
</PropertyGroup>
2627

27-
<ItemGroup>
28-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
29-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
30-
</ItemGroup>
3128
</Project>

‎Directory.Build.targets‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,4 @@
11
<Project>
2-
<ItemGroup>
3-
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="15.5.180"/>
4-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
5-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
6-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
7-
<PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="2.0.1" />
8-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.5.0" />
9-
<!-- https://github.com/coverlet-coverage/coverlet/issues/1042 -->
10-
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="16.9.1" />
11-
<PackageReference Update="Mono.Cecil" Version="0.11.5" />
12-
<PackageReference Update="Moq" Version="4.10.1" />
13-
<!-- Do not upgrade this version or we won't support old SDK -->
14-
<PackageReference Update="Newtonsoft.Json" Version="9.0.1" />
15-
<PackageReference Update="NuGet.Packaging" Version="5.4.0" />
16-
<PackageReference Update="ReportGenerator.Core" Version="4.6.0" />
17-
<!--
18-
Do not change System.Reflection.Metadata version since we need to support VSTest DataCollectors. Goto https://www.nuget.org/packages/System.Reflection.Metadata to check versions.
19-
We need to load assembly version 1.4.2.0 to properly work
20-
We can check minimum supported package version here https://github.com/Microsoft/vstest/blob/master/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L37
21-
-->
22-
<PackageReference Update="System.Reflection.Metadata" Version="1.5.0" />
23-
<PackageReference Update="xunit" Version="2.4.2" />
24-
<PackageReference Update="xunit.assert" Version="2.4.2" />
25-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1"/>
26-
<PackageReference Update="Tmds.ExecFunction" Version="0.4.0" />
27-
<PackageReference Update="System.CommandLine" Version="2.0.0-beta4.22272.1" />
28-
</ItemGroup>
29-
302
<!-- Deterministic build workaround -->
313
<Import Project="$(RepoRoot)\DeterministicBuild.targets" />
324
</Project>

‎Directory.Packages.props‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
9+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
14+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0"/>
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
20+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
21+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.5.0" />
22+
<!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
23+
<!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L35-->
24+
<!-- wrong configuration will create "build\coverlet.msbuild.targets(72,5): error : Unable to read beyond the end of the stream." -->
25+
<!--
26+
vstest 17.5 version /scripts/build/TestPlatform.Dependencies.props
27+
https://github.com/microsoft/vstest/blob/81f87947b316a4faf2bcb5b8c8fa1591baafcc39/scripts/build/TestPlatform.Dependencies.props#L57
28+
vstest 17.8 version
29+
NuGetFrameworksVersion is defined here https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/eng/Versions.props#L94C1-L94C1
30+
-->
31+
<PackageVersion Include="NuGet.Frameworks" Version="5.11.5" />
32+
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
33+
<PackageVersion Include="Moq" Version="4.18.4" />
34+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
35+
<PackageVersion Include="NuGet.Packaging" Version="6.6.1" />
36+
<PackageVersion Include="ReportGenerator.Core" Version="5.1.23" />
37+
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="7.1.4" />
38+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
39+
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
40+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
41+
<!--
42+
Do not change System.Reflection.Metadata version since we need to support VSTest DataCollectors. Goto https://www.nuget.org/packages/System.Reflection.Metadata to check versions.
43+
We need to load assembly version 1.6.0 to properly work
44+
We can check minimum supported package version here https://github.com/Microsoft/vstest/blob/master/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L34
45+
-->
46+
<PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" />
47+
<PackageVersion Include="Tmds.ExecFunction" Version="0.4.0" />
48+
<PackageVersion Include="xunit" Version="2.5.0" />
49+
<PackageVersion Include="xunit.assert" Version="2.5.0" />
50+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0"/>
51+
52+
53+
</ItemGroup>
54+
</Project>

‎coverlet.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3434
DeterministicBuild.targets = DeterministicBuild.targets
3535
Directory.Build.props = Directory.Build.props
3636
Directory.Build.targets = Directory.Build.targets
37+
Directory.Packages.props = Directory.Packages.props
3738
global.json = global.json
3839
EndProjectSection
3940
EndProject
@@ -65,9 +66,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsampl
6566
EndProject
6667
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsample.wpf6", "test\coverlet.tests.projectsample.wpf6\coverlet.tests.projectsample.wpf6.csproj", "{988A5FF0-4326-4F5B-9F05-CB165543A555}"
6768
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coverlet.tests.projectsample.aspmvcrazor", "test\coverlet.tests.projectsample.aspmvcrazor\coverlet.tests.projectsample.aspmvcrazor.csproj", "{6ACF69B1-C01F-44A4-8F8E-2501884238D4}"
69+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsample.aspmvcrazor", "test\coverlet.tests.projectsample.aspmvcrazor\coverlet.tests.projectsample.aspmvcrazor.csproj", "{6ACF69B1-C01F-44A4-8F8E-2501884238D4}"
6970
EndProject
70-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coverlet.tests.projectsample.aspmvcrazor.tests", "test\coverlet.tests.projectsample.aspmvcrazor.tests\coverlet.tests.projectsample.aspmvcrazor.tests.csproj", "{F508CCDD-5BC8-4AB6-97B3-D37498813C41}"
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsample.aspmvcrazor.tests", "test\coverlet.tests.projectsample.aspmvcrazor.tests\coverlet.tests.projectsample.aspmvcrazor.tests.csproj", "{F508CCDD-5BC8-4AB6-97B3-D37498813C41}"
7172
ProjectSection(ProjectDependencies) = postProject
7273
{31084026-D563-4B91-BE71-174C4270CCF4} = {31084026-D563-4B91-BE71-174C4270CCF4}
7374
{6ACF69B1-C01F-44A4-8F8E-2501884238D4} = {6ACF69B1-C01F-44A4-8F8E-2501884238D4}

‎eng/azure-pipelines-nightly.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
pool:
2-
vmImage: 'windows-2019'
2+
vmImage: 'windows-latest'
33

44
steps:
55
- task: UseDotNet@2
66
inputs:
7-
version: 3.1.404
8-
displayName: Install .NET Core SDK 3.1.404
7+
version: 6.0.408
8+
displayName: Install .NET Core SDK 6.0.408
99

1010
- task: UseDotNet@2
1111
inputs:
12-
version: 5.0.401
13-
displayName: Install .NET Core SDK 5.0.401
12+
version: 7.0.203
13+
displayName: Install .NET Core SDK 7.0.203
1414

1515
- task: UseDotNet@2
1616
inputs:

‎eng/build.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
steps:
2-
- task: UseDotNet@2
3-
inputs:
4-
version: 3.1.404
5-
displayName: Install .NET Core SDK 3.1.404
6-
7-
- task: UseDotNet@2
8-
inputs:
9-
version: 5.0.401
10-
displayName: Install .NET Core SDK 5.0.401
11-
122
- task: UseDotNet@2
133
inputs:
144
version: 6.0.408

‎src/coverlet.collector/build/netstandard1.0/coverlet.collector.targets‎ renamed to ‎src/coverlet.collector/build/netstandard2.0/coverlet.collector.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
2626
<PropertyGroup>
2727
<_CoverletSdkNETCoreSdkVersion>$(NETCoreSdkVersion)</_CoverletSdkNETCoreSdkVersion>
2828
<_CoverletSdkNETCoreSdkVersion Condition="$(_CoverletSdkNETCoreSdkVersion.Contains('-'))">$(_CoverletSdkNETCoreSdkVersion.Split('-')[0])</_CoverletSdkNETCoreSdkVersion>
29-
<_CoverletSdkMinVersionWithDependencyTarget>3.1.300</_CoverletSdkMinVersionWithDependencyTarget>
29+
<_CoverletSdkMinVersionWithDependencyTarget>6.0.100</_CoverletSdkMinVersionWithDependencyTarget>
3030
<_CoverletSourceRootTargetName>CoverletGetPathMap</_CoverletSourceRootTargetName>
3131
<_CoverletSourceRootTargetName Condition="'$([System.Version]::Parse($(_CoverletSdkNETCoreSdkVersion)).CompareTo($([System.Version]::Parse($(_CoverletSdkMinVersionWithDependencyTarget)))))' &gt;= '0' ">InitializeSourceRootMappedPaths</_CoverletSourceRootTargetName>
3232
</PropertyGroup>

‎src/coverlet.collector/coverlet.collector.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979

8080
<Target Name="PackBuildOutputs">
8181
<ItemGroup>
82-
<TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="build\netstandard1.0\" />
83-
<TfmSpecificPackageFile Include="$(TargetDir)\*.pdb" PackagePath="build\netstandard1.0\" />
84-
<TfmSpecificPackageFile Include="$(TargetDir)\*.deps.json" PackagePath="build\netstandard1.0\" />
82+
<TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="build\netstandard2.0\" />
83+
<TfmSpecificPackageFile Include="$(TargetDir)\*.pdb" PackagePath="build\netstandard2.0\" />
84+
<TfmSpecificPackageFile Include="$(TargetDir)\*.deps.json" PackagePath="build\netstandard2.0\" />
8585
</ItemGroup>
8686
</Target>
8787
</Project>

‎src/coverlet.core/coverlet.core.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Mono.Cecil" />
11-
<PackageReference Include="Newtonsoft.Json" />
12-
<PackageReference Include="System.Reflection.Metadata" />
1310
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
1411
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
1512
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
13+
<PackageReference Include="Mono.Cecil" />
14+
<PackageReference Include="Newtonsoft.Json" />
15+
<PackageReference Include="System.Collections.Immutable" />
16+
<PackageReference Include="System.Reflection.Metadata" />
1617
</ItemGroup>
1718

1819
</Project>

‎src/coverlet.msbuild.tasks/coverlet.msbuild.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PropertyGroup>
77
<_CoverletSdkNETCoreSdkVersion>$(NETCoreSdkVersion)</_CoverletSdkNETCoreSdkVersion>
88
<_CoverletSdkNETCoreSdkVersion Condition="$(_CoverletSdkNETCoreSdkVersion.Contains('-'))">$(_CoverletSdkNETCoreSdkVersion.Split('-')[0])</_CoverletSdkNETCoreSdkVersion>
9-
<_CoverletSdkMinVersionWithDependencyTarget>3.1.300</_CoverletSdkMinVersionWithDependencyTarget>
9+
<_CoverletSdkMinVersionWithDependencyTarget>6.0.100</_CoverletSdkMinVersionWithDependencyTarget>
1010
<_CoverletSourceRootTargetName>CoverletGetPathMap</_CoverletSourceRootTargetName>
1111
<_CoverletSourceRootTargetName Condition="'$([System.Version]::Parse($(_CoverletSdkNETCoreSdkVersion)).CompareTo($([System.Version]::Parse($(_CoverletSdkMinVersionWithDependencyTarget)))))' &gt;= '0' ">InitializeSourceRootMappedPaths</_CoverletSourceRootTargetName>
1212
</PropertyGroup>

0 commit comments

Comments
 (0)