Skip to content

Commit f41d65d

Browse files
bradwilsonbradwilson
committed
Restructure version naming
1 parent bf6400f commit f41d65d

File tree

10 files changed

+36
-87
lines changed

10 files changed

+36
-87
lines changed

‎Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project>
22

33
<PropertyGroup>
4-
<ILRepackVersion>2.0.43</ILRepackVersion>
5-
<MicrosoftNetCoreAppRefVersion>6.0.32</MicrosoftNetCoreAppRefVersion>
6-
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNetFrameworkReferenceAssembliesVersion>
7-
<MicrosoftNetTestSdkVersion>17.13.0</MicrosoftNetTestSdkVersion>
8-
<MicrosoftSourceLinkGitHubVersion>8.0.0</MicrosoftSourceLinkGitHubVersion>
9-
<MicrosoftTestPlatformObjectModelVersion>$(MicrosoftNetTestSdkVersion)</MicrosoftTestPlatformObjectModelVersion>
10-
<NerdbankGitVersioningVersion>3.7.115</NerdbankGitVersioningVersion>
11-
<NSubstituteVersion>5.3.0</NSubstituteVersion>
12-
<TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
13-
<XunitAnalyzersVersion>1.22.0</XunitAnalyzersVersion>
14-
<XunitV2Version>2.9.3</XunitV2Version>
15-
<XunitV3Version>2.0.3</XunitV3Version>
4+
<ILRepack_Version>2.0.44</ILRepack_Version>
5+
<Microsoft_NetCore_App_Ref_Version>9.0.7</Microsoft_NetCore_App_Ref_Version>
6+
<Microsoft_NETFramework_ReferenceAssemblies_Version>1.0.3</Microsoft_NETFramework_ReferenceAssemblies_Version>
7+
<Microsoft_NET_Test_Sdk_Version>17.13.0</Microsoft_NET_Test_Sdk_Version>
8+
<Microsoft_SourceLink_GitHub_Version>8.0.0</Microsoft_SourceLink_GitHub_Version>
9+
<Microsoft_TestPlatform_ObjectModel_Version>$(Microsoft_NET_Test_Sdk_Version)</Microsoft_TestPlatform_ObjectModel_Version>
10+
<Nerdbank_GitVersioning_Version>3.7.115</Nerdbank_GitVersioning_Version>
11+
<NSubstitute_Version>5.3.0</NSubstitute_Version>
12+
<TunnelVisionLabs_ReferenceAssemblyAnnotator_Version>1.0.0-alpha.160</TunnelVisionLabs_ReferenceAssemblyAnnotator_Version>
13+
<xunit_analyzers_Version>1.22.0</xunit_analyzers_Version>
14+
<xunit_v3_Version>2.0.3</xunit_v3_Version>
15+
<xunit_Version>2.9.3</xunit_Version>
1616
</PropertyGroup>
1717

1818
</Project>

‎src/Directory.Build.props

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Import Project="..\Versions.props" />
33

44
<PropertyGroup>
5-
<AnnotatedReferenceAssemblyVersion>$(MicrosoftNetCoreAppRefVersion)</AnnotatedReferenceAssemblyVersion>
65
<DebugType>embedded</DebugType>
76
<EmbedUntrackedSources>true</EmbedUntrackedSources>
87
<LangVersion>12.0</LangVersion>
@@ -11,26 +10,23 @@
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="ILRepack" Version="$(ILRepackVersion)">
13+
<PackageReference Include="ILRepack" Version="$(ILRepack_Version)">
1514
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1615
<PrivateAssets>all</PrivateAssets>
1716
</PackageReference>
18-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="all" />
19-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformObjectModelVersion)" PrivateAssets="All" />
20-
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NerdbankGitVersioningVersion)" PrivateAssets="all" />
21-
<PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="$(TunnelVisionLabsReferenceAssemblyAnnotatorVersion)" PrivateAssets="All" />
17+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(Microsoft_SourceLink_GitHub_Version)" PrivateAssets="all" />
18+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(Microsoft_TestPlatform_ObjectModel_Version)" PrivateAssets="All" />
19+
<PackageReference Include="Nerdbank.GitVersioning" Version="$(Nerdbank_GitVersioning_Version)" PrivateAssets="all" />
2220
</ItemGroup>
2321

24-
<ItemGroup>
25-
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNetCoreAppRefVersion)]" />
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
23+
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(Microsoft_NetCore_App_Ref_Version)]" />
24+
<PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="$(TunnelVisionLabs_ReferenceAssemblyAnnotator_Version)" PrivateAssets="All" />
2625
</ItemGroup>
2726

2827
<!-- Enable building .NET Framework on non-Windows machines -->
2928
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
30-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNetFrameworkReferenceAssembliesVersion)">
31-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32-
<PrivateAssets>all</PrivateAssets>
33-
</PackageReference>
29+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(Microsoft_NETFramework_ReferenceAssemblies_Version)" PrivateAssets="All" />
3430
</ItemGroup>
3531

3632
<!-- Support deterministic builds (via https://github.com/clairernovotny/DeterministicBuilds) -->
@@ -109,8 +105,8 @@
109105
<NuspecProperties>
110106
Configuration=$(Configuration);
111107
GitCommitId=$(GitCommitId);
112-
MicrosoftNetTestSdkVersion=$(MicrosoftNetTestSdkVersion);
113-
MicrosoftTestPlatformObjectModelVersion=$(MicrosoftTestPlatformObjectModelVersion);
108+
Microsoft_NET_Test_Sdk_Version=$(Microsoft_NET_Test_Sdk_Version);
109+
Microsoft_TestPlatform_ObjectModel_Version=$(Microsoft_TestPlatform_ObjectModel_Version);
114110
PackageVersion=$(PackageVersion);
115111
SignedPath=$(SignedPath);
116112
</NuspecProperties>

‎src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" PrivateAssets="All" />
21-
<PackageReference Include="xunit.v3.runner.utility" Version="$(XunitV3Version)" />
20+
<PackageReference Include="xunit.analyzers" Version="$(xunit_analyzers_Version)" PrivateAssets="All" />
21+
<PackageReference Include="xunit.v3.runner.utility" Version="$(xunit_v3_Version)" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<developmentDependency>true</developmentDependency>
1818
<dependencies>
1919
<group targetFramework="net472">
20-
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$MicrosoftTestPlatformObjectModelVersion$" />
20+
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Microsoft_TestPlatform_ObjectModel_Version$" />
2121
</group>
2222
<group targetFramework="net8.0"/>
2323
</dependencies>

‎test/CodeCoverage.runsettings

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

‎test/Directory.Build.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525

2626
<!-- Enable building .NET Framework on non-Windows machines -->
2727
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
28-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNetFrameworkReferenceAssembliesVersion)">
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30-
<PrivateAssets>all</PrivateAssets>
31-
</PackageReference>
28+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(Microsoft_NETFramework_ReferenceAssemblies_Version)" PrivateAssets="All" />
3229
</ItemGroup>
3330

3431
</Project>

‎test/test.v1/test.v1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[$(Microsoft_NET_Test_Sdk_Version)]" />
99
<PackageReference Include="xunit" Version="[1.9.2]" />
1010
<PackageReference Include="xunit.extensions" Version="[1.9.2]" />
1111
</ItemGroup>

‎test/test.v2/test.v2.csproj

Lines changed: 2 additions & 2 deletions
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="$(MicrosoftNetTestSdkVersion)" />
9-
<PackageReference Include="xunit" Version="$(XunitV2Version)" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[$(Microsoft_NET_Test_Sdk_Version)]" />
9+
<PackageReference Include="xunit" Version="$(xunit_Version)" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎test/test.v3/test.v3.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
10-
<PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[$(Microsoft_NET_Test_Sdk_Version)]" />
10+
<PackageReference Include="xunit.v3" Version="$(xunit_v3_Version)" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎test/test.xunit.runner.visualstudio/test.xunit.runner.visualstudio.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
11-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformObjectModelVersion)" PrivateAssets="All" />
12-
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
13-
<PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
14-
<PackageReference Include="xunit.v3.runner.utility" Version="$(XunitV3Version)" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[$(Microsoft_NET_Test_Sdk_Version)]" />
11+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(Microsoft_TestPlatform_ObjectModel_Version)" PrivateAssets="All" />
12+
<PackageReference Include="NSubstitute" Version="$(NSubstitute_Version)" />
13+
<PackageReference Include="xunit.v3" Version="$(xunit_v3_Version)" />
14+
<PackageReference Include="xunit.v3.runner.utility" Version="$(xunit_v3_Version)" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)