Skip to content

Commit b8b67d1

Browse files
robertcoltheartrobertcoltheart
authored
Consolidate VS runner into mspec repo (#539)
1 parent 1e575ba commit b8b67d1

File tree

82 files changed

+2992
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2992
-54
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ env:
1212
jobs:
1313
build:
1414
name: build
15-
runs-on: windows-latest
15+
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: Fetch all tags and branches
2121
run: git fetch --prune --unshallow
2222
- name: Build
23-
run: ./build.ps1
23+
run: ./build.sh
2424
- name: Upload artifacts
25-
uses: actions/upload-artifact@v3
25+
uses: actions/upload-artifact@v4
2626
with:
2727
path: artifacts/*.nupkg

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ env:
1010
jobs:
1111
publish:
1212
name: publish
13-
runs-on: windows-latest
13+
runs-on: ubuntu-latest
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Fetch all tags and branches
1919
run: git fetch --prune --unshallow
2020
- name: Deploy
2121
env:
2222
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
23-
run: ./build.ps1 publish
23+
run: ./build.sh publish
2424
- name: Upload artifacts
25-
uses: actions/upload-artifact@v3
25+
uses: actions/upload-artifact@v4
2626
with:
2727
path: artifacts/*.nupkg

‎Directory.Build.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<RootNamespace>Machine.Specifications</RootNamespace>
4-
</PropertyGroup>
52

63
<PropertyGroup>
74
<Authors>Machine Specifications</Authors>
@@ -17,4 +14,5 @@
1714
<ItemGroup>
1815
<None Include="../../images/icon.png" Pack="true" PackagePath="" Visible="false" />
1916
</ItemGroup>
17+
2018
</Project>

‎Machine.Specifications.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.12.35527.113 d17.12
4+
VisualStudioVersion = 17.12.35527.113
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications", "src\Machine.Specifications\Machine.Specifications.csproj", "{EC054D80-8858-4A61-9FD9-0185EA3F4643}"
77
EndProject
@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Machine.Specifications.Fake
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Machine.Specifications.Fakes.Specs", "src\Machine.Specifications.Fakes.Specs\Machine.Specifications.Fakes.Specs.csproj", "{B897126F-BF01-4A97-965D-C2DE1BC63460}"
2929
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Machine.Specifications.Runner.VisualStudio", "src\Machine.Specifications.Runner.VisualStudio\Machine.Specifications.Runner.VisualStudio.csproj", "{D7689810-9604-4E3E-9821-28ABA130B28E}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
@@ -81,6 +83,10 @@ Global
8183
{B897126F-BF01-4A97-965D-C2DE1BC63460}.Debug|Any CPU.Build.0 = Debug|Any CPU
8284
{B897126F-BF01-4A97-965D-C2DE1BC63460}.Release|Any CPU.ActiveCfg = Release|Any CPU
8385
{B897126F-BF01-4A97-965D-C2DE1BC63460}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{D7689810-9604-4E3E-9821-28ABA130B28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{D7689810-9604-4E3E-9821-28ABA130B28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{D7689810-9604-4E3E-9821-28ABA130B28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{D7689810-9604-4E3E-9821-28ABA130B28E}.Release|Any CPU.Build.0 = Release|Any CPU
8490
EndGlobalSection
8591
GlobalSection(SolutionProperties) = preSolution
8692
HideSolutionNode = FALSE

‎src/Machine.Specifications.Analyzers.Tests/Machine.Specifications.Analyzers.Tests.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
56
<ImplicitUsings>enable</ImplicitUsings>
67
<Nullable>enable</Nullable>
78
<LangVersion>latest</LangVersion>
9+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
810
<IsPackable>false</IsPackable>
911
</PropertyGroup>
1012

@@ -13,15 +15,10 @@
1315
</ItemGroup>
1416

1517
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.11.0" />
18+
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.12.0" />
1719
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
1820
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20-
<PackageReference Include="xunit" Version="2.9.2" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
<PrivateAssets>all</PrivateAssets>
24-
</PackageReference>
21+
<PackageReference Include="xunit.v3" Version="1.0.0" />
2522
</ItemGroup>
2623

2724
<ItemGroup>

‎src/Machine.Specifications.Analyzers/Machine.Specifications.Analyzers.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>latest</LangVersion>
8+
<IncludeBuildOutput>false</IncludeBuildOutput>
89
<DevelopmentDependency>true</DevelopmentDependency>
910
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
1011
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackageItems</TargetsForTfmSpecificContentInPackage>
@@ -15,7 +16,7 @@
1516
</PropertyGroup>
1617

1718
<ItemGroup>
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

‎src/Machine.Specifications.Analyzers/Maintainability/AccessModifierShouldNotBeUsedCodeFixProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private SyntaxNode HandleDeclaration(MemberDeclarationSyntax declaration)
8787
.WithLeadingTrivia(trivia);
8888
}
8989

90-
private SyntaxNode GetParentDeclaration(SyntaxNode declaration)
90+
private SyntaxNode? GetParentDeclaration(SyntaxNode? declaration)
9191
{
9292
while (declaration != null)
9393
{

‎src/Machine.Specifications.Core.Specs/Machine.Specifications.Core.Specs.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net472;net8.0</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<LangVersion>latest</LangVersion>
58
<IsPackable>false</IsPackable>
69
</PropertyGroup>
710

811
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
10-
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1113
</ItemGroup>
1214

1315
<ItemGroup>
1416
<ProjectReference Include="..\Machine.Specifications.Core\Machine.Specifications.Core.csproj" />
1517
<ProjectReference Include="..\Machine.Specifications.Fixtures\Machine.Specifications.Fixtures.csproj" />
18+
<ProjectReference Include="..\Machine.Specifications.Runner.VisualStudio\Machine.Specifications.Runner.VisualStudio.csproj" />
1619
<ProjectReference Include="..\Machine.Specifications.Should\Machine.Specifications.Should.csproj" />
1720
</ItemGroup>
1821

‎src/Machine.Specifications.Core/Machine.Specifications.Core.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net472;net6.0</TargetFrameworks>
5+
<RootNamespace>Machine.Specifications</RootNamespace>
56
<AssemblyName>Machine.Specifications</AssemblyName>
67
<PackageId>Machine.Specifications.Core</PackageId>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<Nullable>enable</Nullable>
10+
<LangVersion>latest</LangVersion>
711
</PropertyGroup>
812

913
<PropertyGroup>
1014
<Description>Machine.Specifications is a Context/Specification framework geared towards removing language noise and simplifying tests</Description>
1115
</PropertyGroup>
1216

1317
<ItemGroup>
14-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
18+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
1519
</ItemGroup>
1620

1721
</Project>

‎src/Machine.Specifications.Fakes.Specs/Machine.Specifications.Fakes.Specs.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<LangVersion>latest</LangVersion>
58
<IsPackable>false</IsPackable>
69
</PropertyGroup>
710

811
<ItemGroup>
9-
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.9.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1113
</ItemGroup>
1214

1315
<ItemGroup>
1416
<ProjectReference Include="..\Machine.Specifications.Core\Machine.Specifications.Core.csproj" />
1517
<ProjectReference Include="..\Machine.Specifications.Fakes\Machine.Specifications.Fakes.csproj" />
18+
<ProjectReference Include="..\Machine.Specifications.Runner.VisualStudio\Machine.Specifications.Runner.VisualStudio.csproj" />
1619
<ProjectReference Include="..\Machine.Specifications.Should\Machine.Specifications.Should.csproj" />
1720
</ItemGroup>
1821

0 commit comments

Comments
 (0)