starting #10

ignatandrei · Apr 18, 2020 · 1842a25 · 1842a25
1 parent 022a6f5
commit 1842a25
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 22 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,22 +10,28 @@ variables:
   solution: '**/*.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
+  deployNuget: '0'
 
 steps:
 - task: NuGetToolInstaller@1
 
-- task: NuGetCommand@2
-  inputs:
-    restoreSolution: '$(solution)'
 
-- task: VSBuild@1
-  inputs:
-    solution: '$(solution)'
-    msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:DesktopBuildPackageLocation="$(build.artifactStagingDirectory)\WebApp.zip" /p:DeployIisAppPath="Default Web Site"'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+- script: |
+    cd src
+    cd NetCore2Blockly
+    dotnet tool restore 
+    pwsh ./setVersion.ps1
+    dotnet build --configuration $(buildConfiguration) NetCore2Blockly.sln /m:1    
+  displayName: build sln
 
-- task: VSTest@2
+- script: |
+    echo "pack "
+    dotnet pack src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.csproj --include-source  --no-build -o $(Build.ArtifactStagingDirectory) /p:Configuration=$(buildConfiguration) 
+  displayName: 'dotnet pack '
+
+- task: PublishBuildArtifacts@1
   inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: drop1
+
+
diff --git a/src/NetCore2Blockly/.config/dotnet-tools.json b/src/NetCore2Blockly/.config/dotnet-tools.json
@@ -0,0 +1,72 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-property": {
+      "version": "1.0.0.11",
+      "commands": [
+        "dotnet-property"
+      ]
+    },
+    "powershell": {
+      "version": "7.0.0",
+      "commands": [
+        "pwsh"
+      ]
+    },
+    "xunit-cli": {
+      "version": "0.1.3",
+      "commands": [
+        "xunit"
+      ]
+    },
+    "coverlet.console": {
+      "version": "1.7.0",
+      "commands": [
+        "coverlet"
+      ]
+    },
+    "dotnet-reportgenerator-globaltool": {
+      "version": "4.5.0",
+      "commands": [
+        "reportgenerator"
+      ]
+    },
+    "dotnet-aop": {
+      "version": "2020.2.17.1904",
+      "commands": [
+        "dotnet-aop"
+      ]
+    },
+    "loxsmoke.mddox": {
+      "version": "0.5.1",
+      "commands": [
+        "mddox"
+      ]
+    },
+    "dotnet-project-licenses": {
+      "version": "1.1.1",
+      "commands": [
+        "dotnet-project-licenses"
+      ]
+    },
+    "dotnetthx": {
+      "version": "0.2.0",
+      "commands": [
+        "dotnet-thx"
+      ]
+    },
+    "dotnet-depends": {
+      "version": "0.4.0",
+      "commands": [
+        "dotnet-depends"
+      ]
+    },
+    "dotnet-outdated": {
+      "version": "2.10.0",
+      "commands": [
+        "dotnet-outdated"
+      ]
+    }
+  }
+}
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html
@@ -15,7 +15,6 @@
     <!--do not copy-->
     <script src="doNotCopy/testing.js"></script>
     <script src="doNotCopy/JRTemplating.js"></script>
-
     <!--end do not copy-->
     <style>
         body {
@@ -60,8 +59,9 @@ <h1>
     </textarea>
 
     </div>
+    <!--do not copy-->
     <div id="doNotCopy">
-        <!--do not copy-->
+
         <ul id="results">
         </ul>
 
@@ -75,7 +75,7 @@ <h1>
             function Loadtesting(name) {
                 demoWorkspace.clear();
                 var content = '';
-                
+
                 for (var i = 0; i < testBlocks.length; i++) {
                     if (testBlocks[i].name == name) {
                         //console.log(testBlocks[i]);
@@ -91,7 +91,8 @@ <h1>
             var results = document.getElementById("results");
             results.innerHTML = tmpl("data_tmpl", { data: testBlocks });
         </script>
-    </div><!--do not copy-->
+    </div>
+    <!--do not copy-->
 
     <xml id="toolbox" style="display: none">
         <category name="LocalSite">
@@ -410,7 +411,7 @@ <h1>
             <category id="catVariables" colour="330" custom="VARIABLE" name="Variables"></category>
             <category id="catFunctions" colour="290" custom="PROCEDURE" name="Functions"></category>
             <category id="catJSON" colour="160" name="JSON">
-<!--                <button text="A button" callbackKey="crae"></button>-->
+                <!--                <button text="A button" callbackKey="crae"></button>-->
                 <block type="converttojson"></block>
                 <block type="converttostring"></block>
 
@@ -490,6 +491,7 @@ <h1>
         </block>
 
     </xml>
+    <!--do not copy-->
     <xml id="testSite" style="display: none">
         <block type="variables_set" id="set_n_initial" inline="true" x="20" y="20">
             <field name="VAR">n</field>
@@ -641,6 +643,7 @@ <h1>
             </next>
         </block>
     </xml>
+    <!--end do not copy-->
 
     <script>
 
@@ -684,7 +687,7 @@ <h1>
             //value_ValueToConvert = value_ValueToConvert.replace(/(\r\n|\n|\r)/gm, "")
             const code = 'JSON.parse(' + value_ValueToConvert + ')';
             return [code, Blockly.JavaScript.ORDER_NONE];
-            
+
         };
         Blockly.Blocks['converttostring'] = {
             init: function () {
@@ -732,7 +735,7 @@ <h1>
             var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC);
             var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC);
             var value_newvalue = Blockly.JavaScript.valueToCode(block, 'NewValue', Blockly.JavaScript.ORDER_ATOMIC);
-            var code = value_objecttochange +"[" + value_propertyname + ']=' + value_newvalue+";";
+            var code = value_objecttochange + "[" + value_propertyname + ']=' + value_newvalue + ";";
             return code;
         };
 
@@ -758,7 +761,7 @@ <h1>
         Blockly.JavaScript['getproperty'] = function (block) {
             var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC);
             var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC);
-            
+
             var code = value_objecttochange + "[" + value_propertyname + ']';
             // TODO: Change ORDER_NONE to the correct strength.
             return [code, Blockly.JavaScript.ORDER_NONE];
@@ -821,7 +824,7 @@ <h1>
                 console.log(text);
                 text = text ? text.toString() : '';
                 step++;
-                
+
                 console.log(`step ${step}`);
                 zip.file(`result ${step}) ${text}`);
                 outputArea.value = outputArea.value + '\n step' + step + ':' + text;
@@ -1116,7 +1119,7 @@ <h1>
             });
         }
         function SaveBlocks() {
-            var xml = Blockly.Xml.workspaceToDom(demoWorkspace,true);
+            var xml = Blockly.Xml.workspaceToDom(demoWorkspace, true);
             var xml_text = Blockly.Xml.domToPrettyText(xml);
             var n = formatDate(new Date());
             window.history.pushState({ dom: n }, xml_text, "?dom=" + n);

diff --git a/src/NetCore2Blockly/setVersion.ps1 b/src/NetCore2Blockly/setVersion.ps1
@@ -0,0 +1,25 @@
+$TimeNow = Get-Date
+$d = $TimeNow.ToUniversalTime()
+$year = $TimeNow.Year
+$startOfYear = Get-Date -Year $year -Month 1 -Day 1 -Hour 0 -Minute 0 -Second 0 -Millisecond 0
+
+$diff = NEW-TIMESPAN -Start $startOfYear -End $TimeNow
+#$diff.TotalSeconds -as [int]
+
+$assemblyVersion=$d.ToString("1.yyyy.1MMdd.1HHmm")
+dotnet-property "**/*.csproj" AssemblyVersion:"$assemblyVersion"
+dotnet dotnet-property "**/*.csproj" AssemblyVersion:"$assemblyVersion"
+
+$version=$d.ToString("1.0.yyyy.") + ($diff.TotalSeconds -as  [int]).ToString()
+dotnet-property "**/*.csproj" Version:"$version"
+dotnet dotnet-property "**/*.csproj" Version:"$version"
+
+$releaseNotes = "BuildNumber $env:BUILD_BUILDNUMBER"
+$releaseNotes += ";author $env:BUILD_SOURCEVERSIONAUTHOR"
+$releaseNotes += ";message $env:BUILD_SOURCEVERSIONMESSAGE"
+$releaseNotes +=";source for this release github.com/ignatandrei/webAPI2CLI/commit/$env:BUILD_SOURCEVERSION"
+
+$releaseNotes
+
+dotnet-property "**/*.csproj" PackageReleaseNotes:"$releaseNotes"
+dotnet dotnet-property "**/*.csproj" PackageReleaseNotes:"$releaseNotes"