From 960cebce03a847c5ac7d29d45fe7fb93189fb261 Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Wed, 23 Jan 2019 12:49:28 -0800 Subject: [PATCH 1/5] Added 35 and net standard and 40 framework in travis.sln --- OptimizelySDK.Travis.sln | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OptimizelySDK.Travis.sln b/OptimizelySDK.Travis.sln index 4919a47a..6eba471d 100644 --- a/OptimizelySDK.Travis.sln +++ b/OptimizelySDK.Travis.sln @@ -13,6 +13,12 @@ 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.NetStandard16", "OptimizelySDK.NetStandard16\OptimizelySDK.NetStandard16.csproj", "{69051F14-3E48-4F0F-8CE2-09E93867FE86}" +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 +33,18 @@ 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 + {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69051F14-3E48-4F0F-8CE2-09E93867FE86}.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 From 62ae717b4ef8eb0dcc3140d0b6555efa9311da6b Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Wed, 23 Jan 2019 13:02:48 -0800 Subject: [PATCH 2/5] nit fix. UserProfileUtil case sensitive --- OptimizelySDK.Net35/OptimizelySDK.Net35.csproj | 2 +- OptimizelySDK.Net40/OptimizelySDK.Net40.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 67df06abde3056cf425ac25659b158504400cccb Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Wed, 23 Jan 2019 13:13:14 -0800 Subject: [PATCH 3/5] Removing net standard --- OptimizelySDK.Travis.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OptimizelySDK.Travis.sln b/OptimizelySDK.Travis.sln index 6eba471d..b42efb34 100644 --- a/OptimizelySDK.Travis.sln +++ b/OptimizelySDK.Travis.sln @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution 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.NetStandard16", "OptimizelySDK.NetStandard16\OptimizelySDK.NetStandard16.csproj", "{69051F14-3E48-4F0F-8CE2-09E93867FE86}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net40", "OptimizelySDK.Net40\OptimizelySDK.Net40.csproj", "{41AFD990-BC81-49E3-BD85-40972BB2C262}" EndProject Global @@ -37,10 +35,6 @@ Global {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 - {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69051F14-3E48-4F0F-8CE2-09E93867FE86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69051F14-3E48-4F0F-8CE2-09E93867FE86}.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 From ab8be6e2fef4f6f42eb2490fa551538f2cdd11f0 Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Wed, 23 Jan 2019 13:25:41 -0800 Subject: [PATCH 4/5] use msbuild instead build --- .travis.yml | 2 +- OptimizelySDK.Travis.sln | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d48f326f..5349f837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ 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 # Integration tests need to run first to reset the PR build status to pending diff --git a/OptimizelySDK.Travis.sln b/OptimizelySDK.Travis.sln index b42efb34..b77365bf 100644 --- a/OptimizelySDK.Travis.sln +++ b/OptimizelySDK.Travis.sln @@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net35", "Opti EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net40", "OptimizelySDK.Net40\OptimizelySDK.Net40.csproj", "{41AFD990-BC81-49E3-BD85-40972BB2C262}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.NetStandard16", "OptimizelySDK.NetStandard16\OptimizelySDK.NetStandard16.csproj", "{43D17744-B2ED-4FB4-8054-4DC5A9CE4640}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {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 + {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 52a9f484836a59a88c711fb261cddc15f478d1a7 Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Thu, 24 Jan 2019 16:17:16 -0800 Subject: [PATCH 5/5] Removed .net standard and compiling .netstandard using .net core --- .travis.yml | 5 ++++- OptimizelySDK.Travis.sln | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5349f837..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 @@ -11,7 +12,9 @@ install: script: - 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.Travis.sln b/OptimizelySDK.Travis.sln index b77365bf..b42efb34 100644 --- a/OptimizelySDK.Travis.sln +++ b/OptimizelySDK.Travis.sln @@ -17,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net35", "Opti EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.Net40", "OptimizelySDK.Net40\OptimizelySDK.Net40.csproj", "{41AFD990-BC81-49E3-BD85-40972BB2C262}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelySDK.NetStandard16", "OptimizelySDK.NetStandard16\OptimizelySDK.NetStandard16.csproj", "{43D17744-B2ED-4FB4-8054-4DC5A9CE4640}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -41,10 +39,6 @@ Global {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 - {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43D17744-B2ED-4FB4-8054-4DC5A9CE4640}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE