diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2018-06-21 20:37:40 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@joyofsetup.com> | 2018-06-21 20:37:40 -0400 |
| commit | 22497cb5c93d99a3ef81f170cf28b22ba54a2db8 (patch) | |
| tree | b5410d73e77f77d5d82cdef922b8a2f8dcc32a30 /src | |
| parent | e48ed09e26098b10a964b56a4ff0c630c4204d94 (diff) | |
| download | wix-22497cb5c93d99a3ef81f170cf28b22ba54a2db8.tar.gz wix-22497cb5c93d99a3ef81f170cf28b22ba54a2db8.tar.bz2 wix-22497cb5c93d99a3ef81f170cf28b22ba54a2db8.zip | |
Update to netcoreapp2.1 and xunit 2.3.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Data/IntermediateField.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Data/IntermediateField.cs b/src/WixToolset.Data/IntermediateField.cs index 48cdceea..9aed3d81 100644 --- a/src/WixToolset.Data/IntermediateField.cs +++ b/src/WixToolset.Data/IntermediateField.cs | |||
| @@ -6,7 +6,7 @@ namespace WixToolset.Data | |||
| 6 | using System.Diagnostics; | 6 | using System.Diagnostics; |
| 7 | using SimpleJson; | 7 | using SimpleJson; |
| 8 | 8 | ||
| 9 | [DebuggerDisplay("Name={Name,nq} Type={Type} Value={Value.AsString()}")] | 9 | [DebuggerDisplay("Name={Name,nq} Type={Type} Value={Value?.AsString()}")] |
| 10 | public class IntermediateField | 10 | public class IntermediateField |
| 11 | { | 11 | { |
| 12 | public IntermediateField(IntermediateFieldDefinition definition) | 12 | public IntermediateField(IntermediateFieldDefinition definition) |
diff --git a/src/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index fe0d99c5..7d492b1a 100644 --- a/src/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
| 2 | 2 | ||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <TargetFramework>netcoreapp2.0</TargetFramework> | 4 | <TargetFramework>netcoreapp2.1</TargetFramework> |
| 5 | 5 | ||
| 6 | <IsPackable>false</IsPackable> | 6 | <IsPackable>false</IsPackable> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |