update version, and target to net45

AzureSDKAutomation · Nov 17, 2015 · 8761f7d · 8761f7d
1 parent eb7f63d
commit 8761f7d
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 18 deletions.
diff --git a/build.proj b/build.proj
@@ -60,6 +60,7 @@
     <Scope Condition=" '$(Scope)' == '' ">All</Scope>
     <FxTargetList>portable;net40;net45</FxTargetList>
     <FxTargetList Condition=" '$(Scope)' == 'authentication' ">net45</FxTargetList>
+    <ZipExe>$(LibraryToolsFolder)\7-Zip\7z.exe</ZipExe>
   </PropertyGroup>
 
   <ItemGroup>
@@ -292,14 +293,13 @@
     <RemoveDir Directories="$(_UnsignedFolder);$(_SignedFolder)" ContinueOnError="false" />
     <RemoveDir Directories="@(_DnxPackages->'$(PackageOutputDir)\%(Filename)')" ContinueOnError="false" />
 
-    <Exec Command="$(LibraryToolsFolder)\7-Zip\7z.exe x -y -scsUTF-8 -o@(_DnxPackages->'$(PackageOutputDir)\%(Filename)') %(_DnxPackages.Identity)" />
+    <Exec Command="$(ZipExe) x -y -scsUTF-8 -o@(_DnxPackages->'$(PackageOutputDir)\%(Filename)') %(_DnxPackages.Identity)" />
 
     <RemoveDir Directories="@(_DnxPackages->'%(RootDir)%(Directory)\%(Filename)\_rels')" />
     <Delete Files="@(_DnxPackages->'%(RootDir)%(Directory)\%(Filename)\[Content_Types].xml')" />
 
     <ItemGroup>
-      <_TempBinaries Include="$(PackageOutputDir)\**\*.dll"/>
-      <_PackageBinaries Include="@(_TempBinaries)">
+      <_PackageBinaries Include="$(PackageOutputDir)\**\*.dll">
         <!-- Flattened file for signing -->
         <UnsignedFlatFileName>$(_UnsignedFolder)\$([System.String]::new('%(RecursiveDir)%(FileName)%(Extension)').Replace('\', '__'))</UnsignedFlatFileName>
         <SignedFlatFileName>$(_SignedFolder)\$([System.String]::new('%(RecursiveDir)%(FileName)%(Extension)').Replace('\', '__'))</SignedFlatFileName>
@@ -332,8 +332,7 @@
         Condition="!$(DelaySign)"/>
 
     <Copy SourceFiles="@(_PackageBinaries->'%(SignedFlatFileName)')" DestinationFiles="@(_PackageBinaries->'%(FullPath)')"></Copy>
-
-    <Exec Command="$(LibraryToolsFolder)\7-Zip\7z.exe a -tzip -mx9 -r -y $(PackageOutputDir)\%(_DnxPackages.Filename).nupkg" WorkingDirectory="$(PackageOutputDir)\%(_DnxPackages.Filename)" />
+    <Exec Command="$(ZipExe) a -tzip -mx9 -r -y $(PackageOutputDir)\%(_DnxPackages.Filename).nupkg" WorkingDirectory="$(PackageOutputDir)\%(_DnxPackages.Filename)" />
   </Target>
 
 </Project>
diff --git a/...agement/Authorization/Microsoft.Azure.Management.Authorization/Properties/AssemblyInfo.cs b/...agement/Authorization/Microsoft.Azure.Management.Authorization/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@
 [assembly: AssemblyDescription("Provides Microsoft Management Authorization access.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]

diff --git a/src/ResourceManagement/Authorization/Microsoft.Azure.Management.Authorization/project.json b/src/ResourceManagement/Authorization/Microsoft.Azure.Management.Authorization/project.json
@@ -15,7 +15,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Runtime.Serialization": "",
         "System.Threading.Tasks": { "type": "build" },

diff --git a/src/ResourceManagement/Compute/Microsoft.Azure.Management.Compute/project.json b/src/ResourceManagement/Compute/Microsoft.Azure.Management.Compute/project.json
@@ -15,7 +15,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Collections": { "type": "build" },
         "System.Linq.Expressions": {"type": "build"},

diff --git a/src/ResourceManagement/Graph.RBAC/Microsoft.Azure.Graph.RBAC/project.json b/src/ResourceManagement/Graph.RBAC/Microsoft.Azure.Graph.RBAC/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0-preview",
+  "version": "2.0.0-preview",
   "description": "Microsoft.Azure.Graph.RBAC",
   "authors": [ "Microsoft" ],
   "tags": [ "Microsoft AutoRest Management REST" ],
@@ -16,7 +16,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Collections": { "type": "build" },
         "System.Linq.Expressions": {"type": "build"},

diff --git a/src/ResourceManagement/Network/Microsoft.Azure.Management.Network/project.json b/src/ResourceManagement/Network/Microsoft.Azure.Management.Network/project.json
@@ -16,7 +16,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Collections": { "type": "build" },
         "System.Linq.Expressions": {"type": "build"},

diff --git a/...sourceManagement/Resource/Microsoft.Azure.Management.Resources/Properties/AssemblyInfo.cs b/...sourceManagement/Resource/Microsoft.Azure.Management.Resources/Properties/AssemblyInfo.cs
@@ -19,8 +19,8 @@
 [assembly: AssemblyTitle("Microsoft Azure Resource Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure resource management operations including Resource Groups.")]
 
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]

diff --git a/src/ResourceManagement/Resource/Microsoft.Azure.Management.Resources/project.json b/src/ResourceManagement/Resource/Microsoft.Azure.Management.Resources/project.json
@@ -16,7 +16,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Collections": { "type": "build" },
         "System.Linq.Expressions": {"type": "build"},

diff --git a/src/ResourceManagement/Storage/Microsoft.Azure.Management.Storage/Properties/AssemblyInfo.cs b/src/ResourceManagement/Storage/Microsoft.Azure.Management.Storage/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
 [assembly: AssemblyTitle("Microsoft Azure Storage Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure Storage management functions for managing the Microsoft Azure Storage service.")]
 
-[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyVersion("4.0.0.0")]
 [assembly: AssemblyFileVersion("4.0.0.0")]
 
 [assembly: AssemblyConfiguration("")]

diff --git a/src/ResourceManagement/Storage/Microsoft.Azure.Management.Storage/project.json b/src/ResourceManagement/Storage/Microsoft.Azure.Management.Storage/project.json
@@ -16,7 +16,7 @@
   },
 
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Collections": { "type": "build" },
         "System.Linq.Expressions": {"type": "build"},

diff --git a/src/TestFramework/Microsoft.Azure.Test.HttpRecorder/project.json b/src/TestFramework/Microsoft.Azure.Test.HttpRecorder/project.json
@@ -12,7 +12,7 @@
     "Newtonsoft.Json": "6.0.8"
   },
   "frameworks": {
-    "net451": {
+    "net45": {
       "frameworkAssemblies": {
         "System.Net.Http": "",
         "System.Xml.Linq": { "type": "build" },

diff --git a/src/TestFramework/Microsoft.Rest.ClientRuntime.Azure.TestFramework/project.json b/src/TestFramework/Microsoft.Rest.ClientRuntime.Azure.TestFramework/project.json
@@ -9,7 +9,7 @@
     "keyFile": "../../../tools/MSSharedLibKey.snk"
   },
   "frameworks": {
-    "net451": {
+    "net45": {
       "System.Net.Http": "",
       "System.Runtime": { "type": "build" },
       "System.Threading.Tasks": { "type": "build" }

diff --git a/tools/nuget.targets b/tools/nuget.targets
@@ -92,8 +92,29 @@
     </ItemGroup>
     <Copy SourceFiles="@(_DnxPackages)" DestinationFolder="$(PackageOutputDir)" Condition=" @(Dnx_AutoRestLibraries) != '' " />
     <CallTarget Targets="SignAssembliesInDnxPackages" Condition=" @(Dnx_AutoRestLibraries) != '' and '$(CodeSign)' == 'true' " />
+
+    <CallTarget Targets="RenameResourceManagementAssemblies" Condition=" @(Dnx_AutoRestLibraries) != '' " />
   </Target>
 
+  <Target Name="RenameResourceManagementAssemblies" DependsOnTargets="PrepareForAutoRestLibraries">
+    <ItemGroup>
+      <_ResourcePackages Include="$(PackageOutputDir)\Microsoft.Azure.Management.Resources*.nupkg" ></_ResourcePackages>
+    </ItemGroup>
+    <RemoveDir Directories="@(_ResourcePackages->'%(RootDir)%(Directory)\%(Filename)')" />
+    <Exec Command="$(ZipExe) x -y -scsUTF-8 -o@(_ResourcePackages->'%(RootDir)%(Directory)\%(Filename)') %(_ResourcePackages.Identity)" />
+    <!--<RemoveDir Directories="@(_ResourcePackages->'%(RootDir)%(Directory)\%(Filename)\_rels')" />
+    <Delete Files="@(_ResourcePackages->'%(RootDir)%(Directory)\%(Filename)\[Content_Types].xml')" />-->
+
+    <ItemGroup>
+      <_ResourceManagementAssemblies Include="$(PackageOutputDir)\Microsoft.Azure.Management.Resources*\lib\*\Microsoft.Azure.Management.Resources.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_ResourceManagementAssemblies)" DestinationFiles="@(_ResourceManagementAssemblies->'%(ROOTDIR)%(Directory)Microsoft.Azure.ResourceManager%(Extension)')" />
+    <Delete Files="@(_ResourceManagementAssemblies)" />
+    <Delete Files="@(_ResourcePackages)" />
+    <Exec Command="$(ZipExe) a -tzip -mx9 -r -y $(PackageOutputDir)\%(_ResourcePackages.Filename).nupkg" WorkingDirectory="$(PackageOutputDir)\%(_ResourcePackages.Filename)" />
+  </Target>
+
   <Target Name="Publish">
     <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />