Skip to content

Commit

Permalink
Use .NET 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jaylorch committed Mar 2, 2022
1 parent 5e12d11 commit bcb2967
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 18 deletions.
12 changes: 7 additions & 5 deletions ironfleet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ IronFleet is licensed under the MIT license included in the [LICENSE](./LICENSE)
# Setup

To use Ironfleet, you'll need the following tools:
* .NET 5.0 SDK (available at `https://dotnet.microsoft.com/download`)
* .NET 6.0 SDK (available at `https://dotnet.microsoft.com/download`)
* Dafny v3.4.0 (verifier, available at `https://github.com/dafny-lang/dafny`)
* python 2 or 3 (needed for running scons)
* scons (installable by running `pip install scons`)

The instructions below have been tested using Windows 10, macOS Catalina, and
Ubuntu 20.04. They should also work for other platforms Dafny and .NET support,
such as Ubuntu 16.04 and Debian. On Windows, they work with at least the
following shells: Command Prompt, Windows PowerShell, and Cygwin mintty.
The instructions below have been tested using Windows 10 and 11, macOS
Catalina, and Ubuntu 20.04. They should also work for other platforms
Dafny and .NET support, such as Ubuntu 16.04 and Debian. On Windows,
they work with at least the following shells: Command Prompt, Windows
PowerShell, Cygwin mintty, and Ubuntu 20.04 on Windows Subsystem for
Linux.

# Verification and Compilation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions ironfleet/src/IronRSLClient/IronRSLClient.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PackageId>IronRSLClient</PackageId>
<Version>1.0.3</Version>
<Version>1.0.4</Version>
<Authors>Jay Lorch and Chris Hawblitzel</Authors>
<Company>Microsoft Corporation</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\IronfleetCommon\Timer.cs" />
<Compile Include="..\IronfleetCommon\Networking.cs" />
<Compile Include="..\Dafny\Distributed\Common\Native\IoFramework.cs" />
<Compile Include="..\IronRSLClient\RSLClient.cs" />
<!-- <PackageReference Include="IronRSLClient" Version="1.0.3" /> -->
<!-- <PackageReference Include="IronRSLClient" Version="1.0.4" /> -->
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -11,7 +11,7 @@
<Compile Include="..\IronfleetCommon\Networking.cs" />
<Compile Include="..\Dafny\Distributed\Common\Native\IoFramework.cs" />
<Compile Include="..\IronRSLClient\RSLClient.cs" />
<!-- <PackageReference Include="IronRSLClient" Version="1.0.3" /> -->
<!-- <PackageReference Include="IronRSLClient" Version="1.0.4" /> -->
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ironfleet/src/IronRSLKVServer/IronRSLKVServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down

0 comments on commit bcb2967

Please sign in to comment.