Skip to content

Commit

Permalink
Fix real scenario execution failure (#156)
Browse files Browse the repository at this point in the history
* Update libraries.csproj deps version

* Update tests.csproj deps version

* Add build.proj in root to make it possible to use dotnet build/clean/restore/test from the root.

* Bump to .NET 8.0, bump project versions.

* Bump dotnet.yml version to .NET 8

---------

Co-authored-by: carlossanlop <[email protected]>
  • Loading branch information
carlossanlop and carlossanlop authored Feb 3, 2023
1 parent 54afaa8 commit cc8e3e8
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Restore dependencies of PortToTripleSlash
run: dotnet restore src/PortToTripleSlash/PortToTripleSlash.sln
- name: Build PortToTripleSlash
Expand Down
22 changes: 22 additions & 0 deletions build.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project DefaultTargets="Build">
<ItemGroup>
<Solution Include="**\*.sln" />
<TestProject Include="**\**\tests\*.csproj" />
</ItemGroup>

<Target Name="Clean">
<MSBuild Projects="@(Solution)" Targets="Clean" />
</Target>

<Target Name="Restore">
<MSBuild Projects="@(Solution)" Targets="Restore" />
</Target>

<Target Name="Build">
<MSBuild Projects="@(Solution)" Targets="Build" />
</Target>

<Target Name="VSTest">
<MSBuild Projects="@(TestProject)" Targets="VSTest" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions src/PortToDocs/src/app/PortToDocs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<StartupObject>ApiDocsSync.PortToDocs.PortToDocs</StartupObject>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<Version>1.1</Version>
<Version>1.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/PortToDocs/src/libraries/libraries.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/PortToDocs/tests/tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/PortToTripleSlash/src/app/PortToTripleSlash.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<StartupObject>ApiDocsSync.PortToTripleSlash.PortToTripleSlash</StartupObject>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<Version>1.2</Version>
<Version>1.3</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PortToTripleSlash/src/libraries/libraries.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand All @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.5.5" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.5.0-2.final" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4-beta1.22559.1">
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/PortToTripleSlash/tests/tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down Expand Up @@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23060.7" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23103.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221221-03" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
Expand Down

0 comments on commit cc8e3e8

Please sign in to comment.