Merge pull request #5 from frankhaugen/frankhaugen-patch-1

Update main.yml
frankhaugen · Dec 14, 2023 · e47ede9 · e47ede9
2 parents 00d001e + 38e33cf
commit e47ede9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,9 +8,6 @@ on:
     branches: [main]
   release:
     types: [published]
-
-env:
-  DOTNET_VERSION: 7.0.x
 
 jobs:
   prepare_versions:
@@ -41,7 +38,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: $DOTNET_VERSION
+          dotnet-version: 7.0.x
       - name: Build (Conditional Versioning)
         run: |
           if [ "${{ github.event_name }}" = "pull_request" ] || [ "${{ github.event_name }}" = "push" ]; then
@@ -69,7 +66,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: $DOTNET_VERSION
+          dotnet-version: 7.0.x
       - name: Download Artifacts
         uses: actions/download-artifact@v2
         with:
@@ -88,7 +85,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: $DOTNET_VERSION
+          dotnet-version: 7.0.x
       - name: Download Artifacts
         uses: actions/download-artifact@v2
         with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>

diff --git a/Frank.PulseFlow.Tests.Benchmarks/Frank.PulseFlow.Tests.Benchmarks.csproj b/Frank.PulseFlow.Tests.Benchmarks/Frank.PulseFlow.Tests.Benchmarks.csproj
@@ -12,7 +12,7 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
         <PackageReference Include="BenchmarkDotNet" Version="0.13.11"/>
         <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.11"/>
     </ItemGroup>

diff --git a/Frank.PulseFlow.Tests.Cli/Frank.PulseFlow.Tests.Cli.csproj b/Frank.PulseFlow.Tests.Cli/Frank.PulseFlow.Tests.Cli.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Frank.PulseFlow.Tests/Frank.PulseFlow.Tests.csproj b/Frank.PulseFlow.Tests/Frank.PulseFlow.Tests.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="xunit" Version="2.6.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">

diff --git a/Frank.PulseFlow/Frank.PulseFlow.csproj b/Frank.PulseFlow/Frank.PulseFlow.csproj
@@ -33,14 +33,9 @@
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="'$(TargetFramework)' == 'net8.0'"/>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="7.0.0" PrivateAssets="All" Condition="'$(TargetFramework)' == 'net7.0'"/>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="7.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>