Updating templates and webhost package, replace service bus package on install command, w (#723)

soninaren · web-flow · commit 5f3d43792932 · 2018-09-14T17:27:41.000-07:00
diff --git a/build.fsx b/build.fsx
@@ -329,8 +329,8 @@ Target "AddTemplatesNupkgs" (fun _ ->
     let itemTemplates = (release.["itemTemplates"]).AsString()
     let projectTemplates = (release.["projectTemplates"]).AsString()
 
-    let itemTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Azure.Functions.Templates/2.0.0-rc1-10248"
-    let projectTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Microsoft.AzureFunctions.ProjectTemplates/2.0.0-rc1-10248"
+    let itemTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Azure.Functions.Templates/2.0.0-rc1-10259"
+    let projectTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Microsoft.AzureFunctions.ProjectTemplates/2.0.0-rc1-10259"
 
     use webClient = new WebClient ()
     [
diff --git a/src/Azure.Functions.Cli/Actions/LocalActions/InstallExtensionAction.cs b/src/Azure.Functions.Cli/Actions/LocalActions/InstallExtensionAction.cs
@@ -71,7 +71,13 @@ public async override Task RunAsync()
                     throw new CliArgumentsException("Invalid config path, please verify directory exists");
                 }
 
-                var extensionsProj = await ExtensionsHelper.EnsureExtensionsProjectExistsAsync(_secretsManager, Csx, ConfigPath);
+                var extensionsProj = ExtensionsHelper.GetExtensionsProjectPath(_secretsManager, Csx, ConfigPath);
+                if (FileSystemHelpers.FileExists(extensionsProj))
+                {
+                    FileSystemHelpers.FileDelete(extensionsProj);
+                }
+
+                extensionsProj = await ExtensionsHelper.EnsureExtensionsProjectExistsAsync(_secretsManager, Csx, ConfigPath);
 
                 if (string.IsNullOrEmpty(Package) && string.IsNullOrEmpty(Version))
                 {
diff --git a/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj b/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
@@ -62,7 +62,7 @@
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.1.1-beta03" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta4-10082" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="2.0.0-rc1-12080" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="2.0.0-rc1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Azure.Functions.Cli/Common/Constants.cs b/src/Azure.Functions.Cli/Common/Constants.cs
@@ -58,7 +58,7 @@ public static class StaticResourcesNames
             public const string PythonDockerBuild = "python_docker_build.sh";
         }
 
-        public static ExtensionPackage ExtensionsMetadataGeneratorPackage => new ExtensionPackage { Name = "Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator", Version = "1.0.0" };
+        public static ExtensionPackage ExtensionsMetadataGeneratorPackage => new ExtensionPackage { Name = "Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator", Version = "1.0.1" };
 
         public static IDictionary<string, ExtensionPackage> BindingPackageMap { get; } = new ReadOnlyDictionary<string, ExtensionPackage>(
                 new Dictionary<string, ExtensionPackage> {
@@ -84,12 +84,12 @@ public static class StaticResourcesNames
                     },
                     { "servicebustrigger",
                         new ExtensionPackage() {
-                        Name = "Microsoft.Azure.WebJobs.ServiceBus",
+                        Name = "Microsoft.Azure.WebJobs.Extensions.ServiceBus",
                         Version =  "3.0.0-rc1" }
                     },
                     { "servicebus",
                         new ExtensionPackage() {
-                        Name = "Microsoft.Azure.WebJobs.ServiceBus",
+                        Name = "Microsoft.Azure.WebJobs.Extensions.ServiceBus",
                         Version =  "3.0.0-rc1" }
                     },
                     { "eventhubtrigger",
@@ -131,15 +131,15 @@ public static class StaticResourcesNames
                     { "activitytrigger",
                         new ExtensionPackage() {
                             Name = "Microsoft.Azure.WebJobs.Extensions.DurableTask",
-                            Version =  "1.6.0"} },
+                            Version =  "1.6.1"} },
                     { "orchestrationtrigger",
                         new ExtensionPackage() {
                             Name = "Microsoft.Azure.WebJobs.Extensions.DurableTask",
-                            Version =  "1.6.0"} },
+                            Version =  "1.6.1"} },
                     { "orchestrationclient",
                         new ExtensionPackage() {
                             Name = "Microsoft.Azure.WebJobs.Extensions.DurableTask",
-                            Version =  "1.6.0"} },
+                            Version =  "1.6.1"} },
                     { "eventgridtrigger",
                         new ExtensionPackage() {
                             Name = "Microsoft.Azure.WebJobs.Extensions.EventGrid",
diff --git a/src/Azure.Functions.Cli/Common/FileSystemHelpers.cs b/src/Azure.Functions.Cli/Common/FileSystemHelpers.cs
@@ -85,6 +85,11 @@ public static bool DirectoryExists(string path)
             return Instance.Directory.Exists(path);
         }
 
+        public static void FileDelete(string path)
+        {
+            Instance.File.Delete(path);
+        }
+
         public static void CreateDirectory(string path)
         {
             Instance.Directory.CreateDirectory(path);
diff --git a/src/Azure.Functions.Cli/Helpers/DotnetHelpers.cs b/src/Azure.Functions.Cli/Helpers/DotnetHelpers.cs
@@ -65,6 +65,7 @@ internal static IEnumerable<string> GetTemplates()
                 "ServiceBusQueueTrigger",
                 "ServiceBusTopicTrigger",
                 "EventGridTrigger",
+                "CosmosDBTrigger",
                 "IotHubTrigger",
             };
         }
diff --git a/src/Azure.Functions.Cli/Helpers/ExtensionsHelper.cs b/src/Azure.Functions.Cli/Helpers/ExtensionsHelper.cs
@@ -14,20 +14,26 @@ namespace Azure.Functions.Cli.Helpers
 {
     class ExtensionsHelper
     {
-        public static async Task<string> EnsureExtensionsProjectExistsAsync(ISecretsManager secretsManager, bool csx, string extensionsDir = null)
+        public static string GetExtensionsProjectPath(ISecretsManager secretsManager, bool csx, string extensionsDir = null)
         {
             var workerRuntime = WorkerRuntimeLanguageHelper.GetCurrentWorkerRuntimeLanguage(secretsManager);
             if (workerRuntime == WorkerRuntime.dotnet && !csx)
             {
                 return DotnetHelpers.GetCsproj();
             }
 
+            return Path.Combine(extensionsDir, "extensions.csproj");
+        }
+
+        public static async Task<string> EnsureExtensionsProjectExistsAsync(ISecretsManager secretsManager, bool csx, string extensionsDir = null)
+        {
             if (String.IsNullOrEmpty(extensionsDir))
             {
                 extensionsDir = Environment.CurrentDirectory;
             }
 
-            var extensionsProj = Path.Combine(extensionsDir, "extensions.csproj");
+            var extensionsProj = GetExtensionsProjectPath(secretsManager, csx, extensionsDir);
+
             if (!FileSystemHelpers.FileExists(extensionsProj))
             {
                 FileSystemHelpers.EnsureDirectory(extensionsDir);
diff --git a/src/Azure.Functions.Cli/StaticResources/ExtensionsProj.csproj.template b/src/Azure.Functions.Cli/StaticResources/ExtensionsProj.csproj.template
@@ -5,6 +5,6 @@
 	<DefaultItemExcludes>**</DefaultItemExcludes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Azure.Functions.Cli/StaticResources/templates.json.template b/src/Azure.Functions.Cli/StaticResources/templates.json.template

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,8 @@ Target "AddTemplatesNupkgs" (fun _ ->`
`329`	`329`	`let itemTemplates = (release.["itemTemplates"]).AsString()`
`330`	`330`	`let projectTemplates = (release.["projectTemplates"]).AsString()`
`331`	`331`
`332`		`- let itemTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Azure.Functions.Templates/2.0.0-rc1-10248"`
`333`		`- let projectTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Microsoft.AzureFunctions.ProjectTemplates/2.0.0-rc1-10248"`
	`332`	`+ let itemTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Azure.Functions.Templates/2.0.0-rc1-10259"`
	`333`	`+ let projectTemplates = "https://www.myget.org/F/azure-appservice/api/v2/package/Microsoft.AzureFunctions.ProjectTemplates/2.0.0-rc1-10259"`
`334`	`334`
`335`	`335`	`use webClient = new WebClient ()`
`336`	`336`	`[`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,13 @@ public async override Task RunAsync()`
`71`	`71`	`throw new CliArgumentsException("Invalid config path, please verify directory exists");`
`72`	`72`	`}`
`73`	`73`
`74`		`- var extensionsProj = await ExtensionsHelper.EnsureExtensionsProjectExistsAsync(_secretsManager, Csx, ConfigPath);`
	`74`	`+ var extensionsProj = ExtensionsHelper.GetExtensionsProjectPath(_secretsManager, Csx, ConfigPath);`
	`75`	`+ if (FileSystemHelpers.FileExists(extensionsProj))`
	`76`	`+ {`
	`77`	`+ FileSystemHelpers.FileDelete(extensionsProj);`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ extensionsProj = await ExtensionsHelper.EnsureExtensionsProjectExistsAsync(_secretsManager, Csx, ConfigPath);`
`75`	`81`
`76`	`82`	`if (string.IsNullOrEmpty(Package) && string.IsNullOrEmpty(Version))`
`77`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,11 @@ public static bool DirectoryExists(string path)`
`85`	`85`	`return Instance.Directory.Exists(path);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ public static void FileDelete(string path)`
	`89`	`+ {`
	`90`	`+ Instance.File.Delete(path);`
	`91`	`+ }`
	`92`	`+`
`88`	`93`	`public static void CreateDirectory(string path)`
`89`	`94`	`{`
`90`	`95`	`Instance.Directory.CreateDirectory(path);`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ internal static IEnumerable<string> GetTemplates()`
`65`	`65`	`"ServiceBusQueueTrigger",`
`66`	`66`	`"ServiceBusTopicTrigger",`
`67`	`67`	`"EventGridTrigger",`
	`68`	`+ "CosmosDBTrigger",`
`68`	`69`	`"IotHubTrigger",`
`69`	`70`	`};`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,20 +14,26 @@ namespace Azure.Functions.Cli.Helpers`
`14`	`14`	`{`
`15`	`15`	`class ExtensionsHelper`
`16`	`16`	`{`
`17`		`- public static async Task<string> EnsureExtensionsProjectExistsAsync(ISecretsManager secretsManager, bool csx, string extensionsDir = null)`
	`17`	`+ public static string GetExtensionsProjectPath(ISecretsManager secretsManager, bool csx, string extensionsDir = null)`
`18`	`18`	`{`
`19`	`19`	`var workerRuntime = WorkerRuntimeLanguageHelper.GetCurrentWorkerRuntimeLanguage(secretsManager);`
`20`	`20`	`if (workerRuntime == WorkerRuntime.dotnet && !csx)`
`21`	`21`	`{`
`22`	`22`	`return DotnetHelpers.GetCsproj();`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ return Path.Combine(extensionsDir, "extensions.csproj");`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ public static async Task<string> EnsureExtensionsProjectExistsAsync(ISecretsManager secretsManager, bool csx, string extensionsDir = null)`
	`29`	`+ {`
`25`	`30`	`if (String.IsNullOrEmpty(extensionsDir))`
`26`	`31`	`{`
`27`	`32`	`extensionsDir = Environment.CurrentDirectory;`
`28`	`33`	`}`
`29`	`34`
`30`		`- var extensionsProj = Path.Combine(extensionsDir, "extensions.csproj");`
	`35`	`+ var extensionsProj = GetExtensionsProjectPath(secretsManager, csx, extensionsDir);`
	`36`	`+`
`31`	`37`	`if (!FileSystemHelpers.FileExists(extensionsProj))`
`32`	`38`	`{`
`33`	`39`	`FileSystemHelpers.EnsureDirectory(extensionsDir);`