Searching for csproj, fsproj that uses Microsoft.Net.Sdk.Web

Tasks/DotNetCoreCLIV2/Strings/resources.resjson/en-US/resources.resjson

@@ -103,7 +103,7 @@
   "loc.messages.dotnetCommandFailed": "Dotnet command failed with non-zero exit code on the following projects : %s",
   "loc.messages.noProjectFilesFound": "Project file(s) matching the specified pattern were not found.",
   "loc.messages.noPublishFolderFoundToZip": "A publish folder could not be found to zip for project file: %s.",
-  "loc.messages.noWebProjectFound": "No web project was found in the repository. Web projects are identified by presence of either a web.config file or wwwroot folder in the directory. You can set Publish Web Projects property to false (publishWebProjects: false in yml) if your project doesn't follow this convention or if you want to publish projects other than web projects.",
+  "loc.messages.noWebProjectFound": "No web project was found in the repository. Web projects are identified by presence of either a web.config file, wwwroot folder in the directory, or by the usage of Microsoft.Net.Web.Sdk in your csproj file. You can set Publish Web Projects property to false (publishWebProjects: false in yml) if your project doesn't follow this convention or if you want to publish projects other than web projects.",
   "loc.messages.zipFailed": "Zip failed with error: %s",
   "loc.messages.Error_ApiKeyNotSupported": "DotNetCore currently does not support using an encrypted Api Key.",
   "loc.messages.Error_ExpectedConfigurationElement": "Invalid xml. Expected element named 'configuration'.",

Tasks/DotNetCoreCLIV2/dotnetcore.ts

@@ -2,17 +2,14 @@ import tl = require("azure-pipelines-task-lib/task");
 import tr = require("azure-pipelines-task-lib/toolrunner");
 import path = require("path");
 import fs = require("fs");
+import ltx = require("ltx");
 var archiver = require('archiver');
 
 import * as packCommand from './packcommand';
 import * as pushCommand from './pushcommand';
 import * as restoreCommand from './restorecommand';
 import * as utility from './Common/utility';
 
-
-var ltxdomutility = require('webdeployment-common/ltxdomutility')
-var fileEncoding = require('webdeployment-common/fileencoding')
-
 export class dotNetExe {
     private command: string;
     private projects: string[];
@@ -254,7 +251,7 @@ export class dotNetExe {
     }
 
     private extractOutputArgument(): void {
-        if (!this.arguments || !this.arguments.trim()) {
+        if (!this.arguments || !this.arguments.trim()) {    
             return;
         }
 
@@ -347,30 +344,16 @@ export class dotNetExe {
             } 
             return resolvedProjectFiles;
         }
-
         return projectFiles;
     }
 
     private isWebSdkUsed(projectfile: string) {
         var fileBuffer: Buffer = fs.readFileSync(projectfile);
-        var fileEncodeType = fileEncoding.detectFileEncoding(projectfile, fileBuffer);
-        var webConfigContent: string = fileBuffer.toString(fileEncodeType[0]);
-
-        if(fileEncodeType[1]) {
-            webConfigContent = webConfigContent.slice(1);
-        }
-
-        var ltxDom = new ltxdomutility.LtxDomUtility(webConfigContent);
-        var projectDomArray: Array<any> = ltxDom.getElementsByTagName("project");
-
-        for(var project of projectDomArray) {
-            if(project.attrs['Sdk'].toLowerCase() == "microsoft.net.sdk.web" || 
-                project.attrs['sdk'].toLowerCase() == "microsoft.net.sdk.web") {
-                return true;
-            }
-        }
+        var webConfigContent: string = fileBuffer.toString();
 
-        return false;
+        var projectSdkUsed: string = ltx.parse(webConfigContent).getAttr("sdk") || ltx.parse(webConfigContent).getAttr("Sdk")
+
+        return projectSdkUsed != undefined && projectSdkUsed.toLowerCase() == "microsoft.net.sdk.web"
     }
 
     private isPublishCommand(): boolean {

Tasks/DotNetCoreCLIV2/make.json

@@ -9,12 +9,6 @@
             "module": "../Common/packaging-common",
             "type": "node",
             "compile": true
-        },
-        {
-            "module": "../Common/webdeployment-common",
-            "type": "node",
-            "dest": "./",
-            "compile" : true
         }
     ],
     "rm": [

Tasks/DotNetCoreCLIV2/package.json

@@ -22,7 +22,6 @@
         "azure-pipelines-task-lib": "2.8.0",
         "packaging-common": "file:../../_build/Tasks/Common/packaging-common-1.0.1.tgz",
         "q": "^1.4.1",
-        "utility-common": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz",
-        "webdeployment-common": "file:../../_build/Tasks/Common/webdeployment-common-1.0.0.tgz"
+        "utility-common": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz"
     }
 }