diff options
| -rw-r--r-- | appveyor.cmd | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index 0cf8062c..98506de8 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
| @@ -12,6 +12,8 @@ nuget restore || exit /b | |||
| 12 | msbuild -p:Configuration=%_C% || exit /b | 12 | msbuild -p:Configuration=%_C% || exit /b |
| 13 | 13 | ||
| 14 | :: Test | 14 | :: Test |
| 15 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.BuildTasks || exit /b | ||
| 16 | |||
| 15 | dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b | 17 | dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b |
| 16 | 18 | ||
| 17 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b | 19 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b |
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs index 10840c56..8b2e8e3d 100644 --- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs | |||
| @@ -66,7 +66,7 @@ namespace WixToolsetTest.Sdk | |||
| 66 | var section = intermediate.Sections.Single(); | 66 | var section = intermediate.Sections.Single(); |
| 67 | 67 | ||
| 68 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); | 68 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
| 69 | Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); | 69 | Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath()?.Path); |
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | 72 | ||
| @@ -142,8 +142,8 @@ namespace WixToolsetTest.Sdk | |||
| 142 | var section = intermediate.Sections.Single(); | 142 | var section = intermediate.Sections.Single(); |
| 143 | 143 | ||
| 144 | var fileSymbols = section.Symbols.OfType<FileSymbol>().ToArray(); | 144 | var fileSymbols = section.Symbols.OfType<FileSymbol>().ToArray(); |
| 145 | Assert.Equal(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); | 145 | Assert.Equal(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); |
| 146 | Assert.Equal(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); | 146 | Assert.Equal(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); |
| 147 | } | 147 | } |
| 148 | } | 148 | } |
| 149 | 149 | ||
| @@ -253,7 +253,7 @@ namespace WixToolsetTest.Sdk | |||
| 253 | var section = intermediate.Sections.Single(); | 253 | var section = intermediate.Sections.Single(); |
| 254 | 254 | ||
| 255 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); | 255 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
| 256 | Assert.Equal(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); | 256 | Assert.Equal(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); |
| 257 | } | 257 | } |
| 258 | } | 258 | } |
| 259 | 259 | ||
| @@ -368,7 +368,7 @@ namespace WixToolsetTest.Sdk | |||
| 368 | var section = intermediate.Sections.Single(); | 368 | var section = intermediate.Sections.Single(); |
| 369 | 369 | ||
| 370 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); | 370 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
| 371 | Assert.Equal(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); | 371 | Assert.Equal(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); |
| 372 | } | 372 | } |
| 373 | } | 373 | } |
| 374 | } | 374 | } |
