diff --git a/.gitattributes b/.gitattributes index 305476f..6a36313 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ ############################################################################### # Set default behavior to automatically normalize line endings. ############################################################################### -* text=auto +#* text=auto ############################################################################### # Set default behavior for command prompt diff. # diff --git a/Common/Windows/ClientLibrary/Microsoft.ProjectOxford.Common.csproj b/Common/Windows/ClientLibrary/Microsoft.ProjectOxford.Common.csproj index 0b7604a..6192fa3 100644 --- a/Common/Windows/ClientLibrary/Microsoft.ProjectOxford.Common.csproj +++ b/Common/Windows/ClientLibrary/Microsoft.ProjectOxford.Common.csproj @@ -15,6 +15,8 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile259 v4.5 + + true @@ -69,6 +71,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - + + + + + 11.0 + Debug + AnyCPU + {8388E984-34E1-443D-9F04-D588DC4BBB22} + Library + Properties + Microsoft.ProjectOxford.Linguistics + Microsoft.ProjectOxford.Linguistics + en-US + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile7 + v4.5 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + ..\Sample\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + + + + + + + + diff --git a/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.csproj b/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.csproj index 80e4fec..0b8e878 100644 --- a/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.csproj +++ b/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.csproj @@ -11,10 +11,6 @@ Microsoft.ProjectOxford.Linguistics.Sample v4.5 512 - SAK - SAK - SAK - SAK AnyCPU diff --git a/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.sln b/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.sln index cf04f5a..f98e3a1 100644 --- a/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.sln +++ b/LinguisticAnalysis/Windows/Sample/Linguistics.Sample.sln @@ -1,39 +1,28 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguistics.Sample", "Linguistics.Sample.csproj", "{9BE553C3-E1B7-4C0A-B868-02E4252FA48C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinguisticsClient", "..\ClientLibrary\LinguisticsClient.csproj", "{8388E984-34E1-443D-9F04-D588DC4BBB22}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Release|Any CPU.Build.0 = Release|Any CPU - {8388E984-34E1-443D-9F04-D588DC4BBB22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8388E984-34E1-443D-9F04-D588DC4BBB22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8388E984-34E1-443D-9F04-D588DC4BBB22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8388E984-34E1-443D-9F04-D588DC4BBB22}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 3 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://vstfsng01:8080/tfs/cig - SccProjectUniqueName0 = ..\\ClientLibrary\\LinguisticsClient.csproj - SccProjectName0 = ../ClientLibrary - SccLocalPath0 = ..\\ClientLibrary - SccLocalPath1 = . - SccProjectUniqueName2 = Linguistics.Sample.csproj - SccLocalPath2 = . - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguistics.Sample", "Linguistics.Sample.csproj", "{9BE553C3-E1B7-4C0A-B868-02E4252FA48C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinguisticsClient", "..\ClientLibrary\LinguisticsClient.csproj", "{8388E984-34E1-443D-9F04-D588DC4BBB22}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BE553C3-E1B7-4C0A-B868-02E4252FA48C}.Release|Any CPU.Build.0 = Release|Any CPU + {8388E984-34E1-443D-9F04-D588DC4BBB22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8388E984-34E1-443D-9F04-D588DC4BBB22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8388E984-34E1-443D-9F04-D588DC4BBB22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8388E984-34E1-443D-9F04-D588DC4BBB22}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Vision/Windows/ClientLibrary/Microsoft.ProjectOxford.Vision.csproj b/Vision/Windows/ClientLibrary/Microsoft.ProjectOxford.Vision.csproj index 6fdf7d6..c6b81c6 100644 --- a/Vision/Windows/ClientLibrary/Microsoft.ProjectOxford.Vision.csproj +++ b/Vision/Windows/ClientLibrary/Microsoft.ProjectOxford.Vision.csproj @@ -13,7 +13,7 @@ en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile78 + Profile259 v4.5 SAK SAK diff --git a/Vision/Windows/ClientLibrary/packages.config b/Vision/Windows/ClientLibrary/packages.config index 60ce0f1..884f230 100644 --- a/Vision/Windows/ClientLibrary/packages.config +++ b/Vision/Windows/ClientLibrary/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file