trying to get msbuild tests working

belav · Nov 16, 2023 · 118dc06 · 118dc06
1 parent fdc1cb6
commit 118dc06
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 22 deletions.
diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml
@@ -25,11 +25,13 @@ jobs:
       - run: |
           dotnet tool restore
           dotnet csharpier . --check
-  build_msbuild:
+  test_msbuild:
     runs-on: ubuntu-latest
     name: Build CSharpier.MSBuild
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v3
       - run: |
-          dotnet build Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj
+          dotnet pack Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj -o nupkg /p:Version=0.0.1
+          dotnet build Src/Tests/CSharpier.MsBuild.Test
+
diff --git a/Src/CSharpier.MsBuild.Test/CSharpier.MsBuild.Test.sln b/Src/CSharpier.MsBuild.Test/CSharpier.MsBuild.Test.sln
diff --git a/Tests/CSharpier.MsBuild.Test/Directory.Build.props b/Tests/CSharpier.MsBuild.Test/Directory.Build.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/Src/CSharpier.MsBuild.Test/Dockerfile → Tests/CSharpier.MsBuild.Test/Dockerfile b/Src/CSharpier.MsBuild.Test/Dockerfile → Tests/CSharpier.MsBuild.Test/Dockerfile
@@ -1,4 +1,6 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base
+
+COPY 
 
 COPY nupkg ./nupkg
 COPY Src/CSharpier.MsBuild.Test ./Src/CSharpier.MsBuild.Test

diff --git a/Tests/CSharpier.MsBuild.Test/dirs.csproj b/Tests/CSharpier.MsBuild.Test/dirs.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="**\*.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Src/CSharpier.MsBuild.Test/Class.cs → Tests/CSharpier.MsBuild.Test/net48/Class.cs b/Src/CSharpier.MsBuild.Test/Class.cs → Tests/CSharpier.MsBuild.Test/net48/Class.cs
diff --git a/Tests/CSharpier.MsBuild.Test/net48/net48.csproj b/Tests/CSharpier.MsBuild.Test/net48/net48.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+    <OutputType>library</OutputType>
+    <TargetFramework>net48</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CSharpier.MsBuild" Version="0.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/Tests/CSharpier.MsBuild.Test/net7.0/Class.cs b/Tests/CSharpier.MsBuild.Test/net7.0/Class.cs
@@ -0,0 +1 @@
+public class Class { }
diff --git a/...sBuild.Test/CSharpier.MsBuild.Test.csproj → ...harpier.MsBuild.Test/net7.0/net7.0.csproj b/...sBuild.Test/CSharpier.MsBuild.Test.csproj → ...harpier.MsBuild.Test/net7.0/net7.0.csproj
@@ -4,12 +4,10 @@
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
     <OutputType>library</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.0">
+    <PackageReference Include="CSharpier.MsBuild" Version="0.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Tests/CSharpier.MsBuild.Test/net8.0/Class.cs b/Tests/CSharpier.MsBuild.Test/net8.0/Class.cs
@@ -0,0 +1 @@
+public class Class { }
diff --git a/Tests/CSharpier.MsBuild.Test/net8.0/net8.0.csproj b/Tests/CSharpier.MsBuild.Test/net8.0/net8.0.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+    <OutputType>library</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CSharpier.MsBuild" Version="0.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/Src/CSharpier.MsBuild.Test/nuget.config → Tests/CSharpier.MsBuild.Test/nuget.config b/Src/CSharpier.MsBuild.Test/nuget.config → Tests/CSharpier.MsBuild.Test/nuget.config
diff --git a/global.json b/global.json
@@ -2,5 +2,8 @@
   "sdk": {
     "version": "8.0.100",
     "rollForward": "latestFeature"
+  },
+  "msbuild-sdks": {
+    "Microsoft.Build.Traversal": "4.1.0"
   }
 }