Skip to content

Commit

Permalink
Merge pull request #2480 from CosmosOS/task/update-demo-projects-net6
Browse files Browse the repository at this point in the history
Update demo projects to net 6.0
  • Loading branch information
charlesbetros committed Nov 22, 2022
2 parents 63574da + a0a2781 commit fc7004d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Demos/BeepDemo/BeepDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
</PropertyGroup>

Expand Down
16 changes: 5 additions & 11 deletions Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5</TargetFramework>
<!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>-->
<USB_Name>CosmosGraphicSubsystemBoot</USB_Name>
<Bochs_Name>CosmosGraphicSubsystemBoot</Bochs_Name>
<VMware_Name>CosmosGraphicSubsystemBoot</VMware_Name>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -71,12 +68,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cosmos.Build" NoWarn="NU1604" Version="0.1.0-localbuild20220205102903">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Cosmos.Debug.Kernel" NoWarn="NU1604" Version="0.1.0-localbuild20220205102941" />
<PackageReference Include="Cosmos.System2" NoWarn="NU1604" Version="0.1.0-localbuild20220205102941" />
<PackageReference Include="Cosmos.Build" Version="0-*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Debug.Kernel" Version="0-*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.System2" Version="0-*" NoWarn="NU1604" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion Demos/Guess/GuessKernel.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
Expand Down
5 changes: 4 additions & 1 deletion Demos/ZMachine/ZKernel/ZKernel.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
<Profile>Bochs</Profile>
<BinFormat>ELF</BinFormat>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
Expand Down

0 comments on commit fc7004d

Please sign in to comment.