CSP Artemis

.gitignore

@@ -114,6 +114,7 @@ UpgradeLog*.XML
 
 # NuGet
 packages
+packages/repositories.config
 
 # Mac development
 .DS_Store

README.md

@@ -19,7 +19,7 @@ Using Visual Studio:
   - Invoke "build" command.
   - Most solutions support 3 solution configurations, "Net40", "Net45", and "Portable". you can use "Configruation Manager" to switch and build.
 
-Using command line:
+Using the command line:
 
   - Ensure "msbuild.exe" is under environment pathes, which you can run the command file pre-installed by Visual Studio.
         *C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat*
@@ -36,8 +36,15 @@ Using Visual Studio:
   - Build.
   - "Test Explorer" window will get populated with tests. Go select and invoke.
 
-Using command line:
+Using the command line:
 
   - Refer to the "To build" section to get the command window set up.
   - Invoke "Test" target from "Build.proj". Likely, you need to build test project first, so put in "build" target as well. 
         *msbuild build.proj /t:build;test /p:scope=ResourceManagement\Compute*
+
+### Issues with Generated Code
+Much of the SDK code is generated from metadata specs about the REST APIs. Do not submit PRs that modify generated code. Instead, file an issue describing the problem, OR refer to the the [AutoRest project](AutoRest) to view and modify the generator. 
+>Note: the generated code in the master branch is from a private project. The SDK is migrating to use AutoRest with generated code described by Swagger. Not all of the generator code is public yet, but it will be over the next few weeks. (July 2015).
+
+[AutoRest]:https://github.com/azure/autorest
+

build.proj

@@ -36,19 +36,10 @@
 
   /p:NuGetKey=NUGET_PUBLISHING_KEY
     Provides the key used to publish to a NuGet or MyGet server.
-
     This key should never be committed to source control.
-
-  /p:PublishSymbolSourcePackages
-    A true/false value indicating whether to push the symbol + source
-    packages to a symbol server.
-
+
   /p:NuGetPublishingSource=Uri
     The NuGet Server to push packages to.
-
-  /p:NuGetSymbolPublishingSource=Uri
-    The NuGet Server to push symbol + source packages to.
-
   -->  
 
   <PropertyGroup>
@@ -68,6 +59,7 @@
     <DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
     <Scope Condition=" '$(Scope)' == '' ">All</Scope>
     <FxTargetList>portable;net40;net45</FxTargetList>
+    <FxTargetList Condition=" '$(Scope)' == 'authentication' ">net45</FxTargetList>
   </PropertyGroup>
 
   <ItemGroup>
@@ -131,20 +123,13 @@
      </PropertyGroup>
     <ItemGroup>
       <!--TODO: improve inclue the logic to be more explicit -->
-      <TestDlls Include="@(LibrariesToBuild -> '.\src\**\*%(Filename).Tests\bin\net45-$(Configuration)\*%(Filename).Tests.dll')" Condition=" '$(Scope)' == 'All' " />
+      <TestDlls Include=".\src\**\*.Tests\bin\net45-$(Configuration)\*.Tests.dll" Condition=" '$(Scope)' == 'All' " />
       <TestDlls Include=".\src\$(Scope)\*.Tests\bin\net45-$(Configuration)\*$(TestPartialName)*.Tests.dll" 
                 Condition=" '$(Scope)' != 'All' " />
     </ItemGroup>
-    <!--Assign to a temporary property so *wildcard include* used by transformation will apply -->
-    <PropertyGroup>
-      <_TestDLLs>@(TestDlls)</_TestDLLs>
-    </PropertyGroup>
-    <ItemGroup>
-      <FilteredTestDlls Include="$(_TestDLLs)"></FilteredTestDlls>
-    </ItemGroup>
     <MakeDir Directories="$(LibraryRoot)TestResults"/>
-    <Message Text="%(FilteredTestDlls.Filename)" />
-    <Exec Command="$(LibraryNugetPackageFolder)\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(FilteredTestDlls.Identity)&quot; -html &quot;$(MSBuildProjectDirectory)\TestResults\%(FilteredTestDlls.Filename).html&quot;"
+    <Message Text="%(TestDlls.Filename)" />
+    <Exec Command="$(LibraryNugetPackageFolder)\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(TestDlls.Identity)&quot; -html &quot;$(MSBuildProjectDirectory)\TestResults\%(TestDlls.Filename).html&quot;"
         ContinueOnError="false"/>
   </Target>
 
@@ -166,12 +151,17 @@
     <ItemGroup>
       <DelaySignedAssembliesToValidate Include="binaries\$(LibraryFxTarget)\unsigned\*.dll" />
     </ItemGroup>
+
+    <Message Importance="high" Text="Binaries\$(LibraryFxTarget)\unsigned contains no files. Code sign will skip." 
+             Condition="'@(DelaySignedAssembliesToValidate)' == ''" />
+
     <ValidateStrongNameSignatureTask
         WindowsSdkPath="$(WindowsSdkPath)"
         Assembly="%(DelaySignedAssembliesToValidate.Identity)"
         ExpectedTokenSignature="$(StrongNameToken)"
         ExpectedDelaySigned="true"
-        ContinueOnError="false" />
+        ContinueOnError="false" 
+        Condition="'@(DelaySignedAssembliesToValidate)' != ''"/>
 
     <CodeSigningTask
         Description="Microsoft Azure SDK"
@@ -180,7 +170,7 @@
         DestinationPath="binaries\$(LibraryFxTarget)"
         SigningLogPath="binaries\$(LibraryFxTarget)\signing.log"
         ToolsPath="$(CIToolsPath)"
-        Condition="!$(DelaySign)"/>
+        Condition="!$(DelaySign) and '@(DelaySignedAssembliesToValidate)' != ''"/>
     <!--If we are testing locally then we copy the binaries and do not submit to the code sign server-->
     <Copy SourceFiles="@(DelaySignedAssembliesToValidate)" DestinationFolder="binaries\$(LibraryFxTarget)" Condition="$(DelaySign)" />
 
@@ -193,7 +183,7 @@
         ExpectedTokenSignature="$(StrongNameToken)"
         ExpectedDelaySigned="false"
         ContinueOnError="false" 
-        Condition="!$(DelaySign)"/>
+        Condition="!$(DelaySign) and '@(DelaySignedAssembliesToValidate)' != ''"/>
 
     <RemoveDir Directories="binaries\$(LibraryFxTarget)\unsigned;" ContinueOnError="true" />
   </Target>

src/Authentication/Common.Authentication.Tests/ClientFactoryTests.cs

@@ -13,11 +13,14 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Common.Authentication.Factories;
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Management.Storage;
 using System;
 using System.Collections.Generic;
+using System.Net.Http.Headers;
 using System.Security;
+using System.Linq;
 using Xunit;
 
 namespace Common.Authentication.Test
@@ -102,5 +105,24 @@ public void VerifyClientFactoryWorks()
                 Assert.NotNull(storageAccount);
             }
         }
+
+        [Fact]
+        public void VerifyProductInfoHeaderValueEquality()
+        {
+            ClientFactory factory = new ClientFactory();
+            factory.AddUserAgent("test1", "123");
+            factory.AddUserAgent("test2", "123");
+            factory.AddUserAgent("test1", "123");
+            factory.AddUserAgent("test1", "456");
+            factory.AddUserAgent("test3");
+            factory.AddUserAgent("tesT3");
+
+            Assert.Equal(4, factory.UserAgents.Count);
+            Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test1" && u.Product.Version == "123"));
+            Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test2" && u.Product.Version == "123"));
+            Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test1" && u.Product.Version == "456"));
+            Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test3" && u.Product.Version == null));
+        }
     }
 }
+;

src/Authentication/Common.Authentication.Tests/Common.Authentication.Tests.csproj

@@ -12,6 +12,7 @@
     <FileAlignment>512</FileAlignment>
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>9fdcb6f4</NuGetPackageImportStamp>
+    <SDKTestProject>true</SDKTestProject>
   </PropertyGroup>
   <Import Project="..\..\..\tools\Library.Settings.targets" />
   <ItemGroup>

src/Authentication/Common.Authentication.Tests/Mocks/MockClientFactory.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Headers;
 
 namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
 {
@@ -79,16 +80,17 @@ public void RemoveAction(Type actionType)
             throw new NotImplementedException();
         }
 
-        public List<System.Net.Http.Headers.ProductInfoHeaderValue> UserAgents
+
+        public void AddUserAgent(string productName)
         {
-            get
-            {
-                throw new NotImplementedException();
-            }
-            set
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+
+        public void AddUserAgent(string productName, string productVersion)
+        {
+            throw new NotImplementedException();
+        }
+
+        public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
     }
 }

src/Authentication/Common.Authentication.Tests/ProfileClientTests.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http.Headers;
 using System.Security.Cryptography.X509Certificates;
 using Xunit;
 using CSMSubscription = Microsoft.Azure.Subscriptions.Csm.Models.Subscription;

src/Authentication/Common.Authentication/Common/RequiredResourceLookup.cs

@@ -82,7 +82,7 @@ internal static IList<string> RequiredProvidersForResourceManager<T>() where T :
                 return new[] { NetworkProviderNamespace };
             }
 
-            if (typeof(T).FullName.EndsWith("DataPipelineManagementClient"))
+            if (typeof(T).FullName.EndsWith("DataFactoryManagementClient"))
             {
                 return new[] { DataFactoryProviderNamespace };
             }

src/Authentication/Common.Authentication/Factories/ClientFactory.cs

@@ -32,7 +32,7 @@ public class ClientFactory : IClientFactory
         public ClientFactory()
         {
             actions = new Dictionary<Type, IClientAction>();
-            UserAgents = new List<ProductInfoHeaderValue>();
+            UserAgents = new HashSet<ProductInfoHeaderValue>();
         }
 
         public virtual TClient CreateClient<TClient>(AzureContext context, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
@@ -181,6 +181,28 @@ public void RemoveAction(Type actionType)
             }
         }
 
-        public List<ProductInfoHeaderValue> UserAgents { get; set; }
+        /// <summary>
+        /// Adds user agent to UserAgents collection.
+        /// </summary>
+        /// <param name="productName">Product name.</param>
+        /// <param name="productVersion">Product version.</param>
+        public void AddUserAgent(string productName, string productVersion) 
+        {
+            UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
+        }
+
+        /// <summary>
+        /// Adds user agent to UserAgents collection with empty version.
+        /// </summary>
+        /// <param name="productName">Product name.</param>
+        public void AddUserAgent(string productName)
+        {
+            AddUserAgent(productName, "");
+        }
+
+        /// <summary>
+        /// Gets a hash set of user agents to be included in created clients.
+        /// </summary>
+        public HashSet<ProductInfoHeaderValue> UserAgents { get; private set; }
     }
 }

src/Authentication/Common.Authentication/Interfaces/IClientFactory.cs

@@ -40,6 +40,22 @@ public interface IClientFactory
 
         void RemoveAction(Type actionType);
 
-        List<ProductInfoHeaderValue> UserAgents { get; set; }
+        /// <summary>
+        /// Adds user agent to UserAgents collection with empty version.
+        /// </summary>
+        /// <param name="productName">Product name.</param>
+        void AddUserAgent(string productName);
+
+        /// <summary>
+        /// Adds user agent to UserAgents collection.
+        /// </summary>
+        /// <param name="productName">Product name.</param>
+        /// <param name="productVersion">Product version.</param>
+        void AddUserAgent(string productName, string productVersion);
+
+        /// <summary>
+        /// Gets a hash set of user agents to be included in created clients.
+        /// </summary>
+        HashSet<ProductInfoHeaderValue> UserAgents { get; }
     }
 }

src/Authentication/Common.Authentication/Microsoft.Azure.Common.Authentication.nuget.proj

@@ -5,7 +5,7 @@
 Microsoft.Azure.Common.Authentication
 -->
     <SdkNuGetPackage Include="Microsoft.Azure.Common.Authentication">
-      <PackageVersion>1.0.26-preview</PackageVersion>
+      <PackageVersion>1.0.28-preview</PackageVersion>
       <Folder>$(MSBuildThisFileDirectory)</Folder>
     </SdkNuGetPackage>
   </ItemGroup>

src/Authentication/Common.Authentication/Properties/AssemblyInfo.cs

@@ -26,7 +26,7 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.26.0")]
+[assembly: AssemblyFileVersion("1.0.27.0")]
 
 #if CODESIGN
 [assembly: InternalsVisibleTo("Common.Authentication.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/HDInsight/Microsoft.Hadoop.Avro.Tests/SchemaTests/JsonSchemaBuilderTests.cs

@@ -634,6 +634,30 @@ public void JsonSchemaBuilder_InheritingTheNamespace()
             Assert.AreEqual(schema1.ToString(), schema2.ToString());
         }
 
+        // Test for https://github.com/Azure/azure-sdk-for-net/issues/1206
+        [TestMethod]
+        [TestCategory("CheckIn")]
+        public void JsonSchemaBuilder_FixedTypeReferences()
+        {
+            var guidSchemaJson = "{ \"type\": \"fixed\", \"name\": \"System.Guid\", \"size\": 16 }";
+
+            var schemaWithFixedType = @"{
+                ""type"":""record"",
+                ""name"":""Config"",
+                ""fields"":
+                [
+                    {
+                        ""name"":""ID1"",
+                        ""type"": " + guidSchemaJson + @"
+                    },
+                    {
+                        ""name"":""ID2"",
+                        ""type"":""System.Guid""
+                    }
+                ]}";
+            var schema = this.builder.BuildSchema(schemaWithFixedType);
+        }
+
         [TestInitialize]
         public void TestSetup()
         {