Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update C# to latest #3

Open
wants to merge 6 commits into
base: trunk
Choose a base branch
from
Open

Update C# to latest #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3a73aa
e - Ignore VStudio IDE temp / local folder.
arlobelshee Nov 30, 2021
04b7243
E - Update to .Net 5 runtime.
arlobelshee Nov 30, 2021
0461cab
E - Use nullable refernce types (default to non-null).
arlobelshee Nov 30, 2021
eb71318
F - Switch to XUnit.
arlobelshee Nov 30, 2021
81f220b
t - Test project now depends on main project.
arlobelshee Nov 30, 2021
2d5cf50
e - Update to latest version of the MS Test SDK bindings.
arlobelshee Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.iml
.idea/
.vs/
13 changes: 11 additions & 2 deletions expensereport-csharp/expensereport-csharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "expensereport-csharp", "expensereport-csharp\expensereport-csharp.csproj", "{4D670DD0-5E29-49CE-AFE9-F5C7ACDB89D0}"
# Visual Studio Version 16
VisualStudioVersion = 16.0.31729.503
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "expensereport-csharp", "expensereport-csharp\expensereport-csharp.csproj", "{4D670DD0-5E29-49CE-AFE9-F5C7ACDB89D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "expensereport-ut", "expensereport-ut\expensereport-ut.csproj", "{07C2B482-2F0F-4B66-9F09-9D9505C9466E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "expensereport-ut", "expensereport-ut\expensereport-ut.csproj", "{07C2B482-2F0F-4B66-9F09-9D9505C9466E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -19,4 +22,10 @@ Global
{07C2B482-2F0F-4B66-9F09-9D9505C9466E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07C2B482-2F0F-4B66-9F09-9D9505C9466E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D8E57AC7-4260-4074-A137-17A1F45B7713}
EndGlobalSection
EndGlobal
5 changes: 3 additions & 2 deletions expensereport-csharp/expensereport-csharp/expensereport-csharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<RootNamespace>expensereport_csharp</RootNamespace>
<TargetFramework>net5.0</TargetFramework>
<nullable>Enable</nullable>
<RootNamespace>expensereport_csharp</RootNamespace>
</PropertyGroup>

</Project>
16 changes: 6 additions & 10 deletions expensereport-csharp/expensereport-ut/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
using NUnit.Framework;
using System;
using Xunit;

namespace Tests
{
public class Tests
public class UnitTest1
{
[SetUp]
public void Setup()
{
}

[Test]
[Fact]
public void Test1()
{
Assert.Pass();

}
}
}
}
22 changes: 15 additions & 7 deletions expensereport-csharp/expensereport-ut/expensereport-ut.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>net5.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
<IsPackable>false</IsPackable>
<nullable>Enable</nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.11.0"/>
<PackageReference Include="NUnit3TestAdapter" Version="3.11.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\expensereport-csharp\expensereport-csharp.csproj" />
</ItemGroup>

</Project>