Merge pull request #14 from newrelic-platform/alarson/update_sdk_and_…

…whitespace Updating SDK and fixing whitespace
newrelic · Jan 31, 2014 · 7d6079d · 7d6079d
2 parents 994c367 + 95b5093
commit 7d6079d
Show file tree

Hide file tree

Showing 58 changed files with 6,607 additions and 7,326 deletions.
diff --git a/NewRelic.Microsoft.SqlServer.Plugin.sln b/NewRelic.Microsoft.SqlServer.Plugin.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewRelic.Microsoft.SqlServer.Plugin", "src\NewRelic.Microsoft.SqlServer.Plugin\NewRelic.Microsoft.SqlServer.Plugin.csproj", "{D5E2A43F-3302-420E-BFD0-798A328390C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E17681A6-21E5-4111-8E50-37A442286BB6}"

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ A plugin for monitoring Microsoft SQL Server using the New Relic platform.
   1. Run a text editor **as administrator** and open the file `INSTALLDIR\NewRelic.Microsoft.SqlServer.Plugin.exe.config`.
   2. Find the setting `<service licenseKey="YOUR_KEY_HERE"...>` and replace `YOUR_KEY_HERE` with your New Relic license key.
   3. Configure one or more SQL Servers or Azure SQL Databases
-      * In the `<sqlServers>` section, add a `<sqlServer>` setting for a SQL Server.
+      * In the `<sqlServers>` section, add a `<sqlServer>` setting for _each_ SQL Server instance you wish to monitor.
           * `name="Production Database"` The name of your server is visible on the New Relic dashboard.
           * `connectionString="Server=prd.domain.com,1433;Database=master;Trusted_Connection=True;"` Any valid connection string to your database.
       * In the `<azure>` section, add a `<database>` setting for _each_ Windows Azure SQL Database.

diff --git a/build/versions.targets b/build/versions.targets
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <MajorVersion>1</MajorVersion>
         <MinorVersion>0</MinorVersion>
-        <PatchVersion>11</PatchVersion>
+        <PatchVersion>12</PatchVersion>
 
         <BuildQuality></BuildQuality>
     </PropertyGroup>

diff --git a/lib/NewRelic.Platform.Sdk.dll b/lib/NewRelic.Platform.Sdk.dll
diff --git a/src/Common/CommonAssemblyInfo.cs b/src/Common/CommonAssemblyInfo.cs
@@ -7,6 +7,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.11")]
-[assembly: AssemblyFileVersion("1.0.11")]
-[assembly: AssemblyInformationalVersion("1.0.11")]
+[assembly: AssemblyVersion("1.0.12")]
+[assembly: AssemblyFileVersion("1.0.12")]
+[assembly: AssemblyInformationalVersion("1.0.12")]
diff --git a/src/NewRelic.Microsoft.SqlServer.Plugin.Tests/Configuration/ComponentDataRetrieverTests.cs b/src/NewRelic.Microsoft.SqlServer.Plugin.Tests/Configuration/ComponentDataRetrieverTests.cs