diff --git a/.travis.yml b/.travis.yml index d48f326f..6fcbdba9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: csharp +dotnet: 2.1.502 mono: - 5.2.0 # needed to make travis run the unit tests @@ -9,9 +10,11 @@ install: - nuget install ./OptimizelySDK.Tests/packages.config -OutputDirectory ./packages - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory ./testrunner script: - - xbuild /p:Configuration=Release ./OptimizelySDK.Travis.sln + - msbuild /p:Configuration=Release ./OptimizelySDK.Travis.sln - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./OptimizelySDK.Tests/bin/Release/OptimizelySDK.Tests.dll - +after_success: + - dotnet restore OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj + - dotnet build OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj # Integration tests need to run first to reset the PR build status to pending stages: - 'Integration tests' diff --git a/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj b/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj index 93b868c7..f10bfafd 100644 --- a/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj +++ b/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj @@ -173,7 +173,7 @@ Bucketing\ExperimentUtils - + Bucketing\UserProfileUtil diff --git a/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj b/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj index b8c5cf5c..9d4bd257 100644 --- a/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj +++ b/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj @@ -174,7 +174,7 @@ Bucketing\ExperimentUtils - + Bucketing\UserProfileUtil diff --git a/OptimizelySDK.Travis.sln b/OptimizelySDK.Travis.sln index 4919a47a..b42efb34 100644 --- a/OptimizelySDK.Travis.sln +++ b/OptimizelySDK.Travis.sln @@ -13,6 +13,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net35", "OptimizelySDK.Net35\OptimizelySDK.Net35.csproj", "{C8FF7012-37B7-4D64-AB45-0C62195302EC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net40", "OptimizelySDK.Net40\OptimizelySDK.Net40.csproj", "{41AFD990-BC81-49E3-BD85-40972BB2C262}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +31,14 @@ Global {4DDE7FAA-110D-441C-AB3B-3F31B593E8BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DDE7FAA-110D-441C-AB3B-3F31B593E8BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DDE7FAA-110D-441C-AB3B-3F31B593E8BF}.Release|Any CPU.Build.0 = Release|Any CPU + {C8FF7012-37B7-4D64-AB45-0C62195302EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8FF7012-37B7-4D64-AB45-0C62195302EC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8FF7012-37B7-4D64-AB45-0C62195302EC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8FF7012-37B7-4D64-AB45-0C62195302EC}.Release|Any CPU.Build.0 = Release|Any CPU + {41AFD990-BC81-49E3-BD85-40972BB2C262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41AFD990-BC81-49E3-BD85-40972BB2C262}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41AFD990-BC81-49E3-BD85-40972BB2C262}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41AFD990-BC81-49E3-BD85-40972BB2C262}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE