Remove platform flag (#19)

* Explicitly exclude 'Dockerfile' since 'Dockerfile*' not working

* Remove platform flag

Author: formulahendry

README.md

@@ -59,14 +59,6 @@ Options:
 Azure IoT Edge Module (C#)
 Author: Summer Sun
 Options:
-  -lx|--linux-x64
-                      bool - Optional
-                      Default: true
-
-  -wn|--windows-nano
-                      bool - Optional
-                      Default: true
-
   -s|--skipRestore
                       bool - Optional
                       Default: false
@@ -81,8 +73,6 @@ Options:
 
 ```
 
-Parameter `-lx` means you if want Dockerfile for linux-x64 or not. So does the `-wn` for windows-nano.
-
 Parameter `-s` means if you want to skip the restore of packages referenced in module project.
 
 Parameter `-r` means the Docker repository to host your Azure IoT Edge module.

Test/Test.cs

@@ -38,49 +38,23 @@ public Test(DotNetFixture fixture)
             this.fixture = fixture;
         }
 
-        public static Dictionary<string, List<string>> FlagFilesMapping = new Dictionary<string, List<string>>{
-            {
-                ArchLinux64, new List<string> {
-                    "Dockerfile",
-                    "Dockerfile.amd64.debug"
-                }
-            },
-            {
-                ArchWindowsNano, new List<string> {
-                    "Dockerfile"
-                }
-            }
-        };
-
-        private static string BeforeEach(string lang, string repository, bool linux64 = true, bool windowsNano = true, bool skipRestore = false)
+        private static string BeforeEach(string lang, string repository, bool skipRestore = false)
         {
             var scaffoldName = Path.GetRandomFileName().Replace(".", "").ToString();
-            var command = "new aziotedgemodule -n " + scaffoldName + " -lang " + lang + " -lx " + linux64 + " -wn " + windowsNano + " -s " + skipRestore + " -r " + repository;
+            var command = "new aziotedgemodule -n " + scaffoldName + " -lang " + lang  + " -s " + skipRestore + " -r " + repository;
             Process.Start("dotnet", command).WaitForExit();
             return scaffoldName;
         }
 
         [Theory]
-        [InlineData(CSharp, true, true, true)]
-        [InlineData(CSharp, true, true, false)]
-        [InlineData(CSharp, true, false, true)]
-        [InlineData(CSharp, true, false, false)]
-        [InlineData(CSharp, false, true, true)]
-        [InlineData(CSharp, false, true, false)]
-        [InlineData(CSharp, false, false, true)]
-        [InlineData(CSharp, false, false, false)]
-        [InlineData(FSharp, true, true, true)]
-        [InlineData(FSharp, true, true, false)]
-        [InlineData(FSharp, true, false, true)]
-        [InlineData(FSharp, true, false, false)]
-        [InlineData(FSharp, false, true, true)]
-        [InlineData(FSharp, false, true, false)]
-        [InlineData(FSharp, false, false, true)]
-        [InlineData(FSharp, false, false, false)]
-        public void TestArchitecture(string lang, bool linux64, bool windowsNano, bool skipRestore)
+        [InlineData(CSharp, true)]
+        [InlineData(CSharp, false)]
+        [InlineData(FSharp, true)]
+        [InlineData(FSharp, false)]
+        public void TestArchitecture(string lang, bool skipRestore)
         {
             var repository = "test.azurecr.io/test";
-            var scaffoldName = BeforeEach(lang, repository, linux64, windowsNano, skipRestore);
+            var scaffoldName = BeforeEach(lang, repository, skipRestore);
             var filesToCheck = new List<string> { ".gitignore", "module.json" };
 
             if (skipRestore)
@@ -101,16 +75,6 @@ public void TestArchitecture(string lang, bool linux64, bool windowsNano, bool s
                 filesToCheck.AddRange(new List<string> { "Program.fs", scaffoldName + ".fsproj" });
             }
 
-            if (linux64)
-            {
-                filesToCheck.AddRange(FlagFilesMapping[ArchLinux64]);
-
-            }
-            if (windowsNano)
-            {
-                filesToCheck.AddRange(FlagFilesMapping[ArchWindowsNano]);
-            }
-
             foreach (var file in filesToCheck)
             {
                 Assert.True(File.Exists(Path.Combine(scaffoldName, file)));

content/dotnet-template-azure-iot-edge-module/CSharp/.template.config/template.json

@@ -19,16 +19,6 @@
         }
     ],
     "symbols": {
-        "linux-x64": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "true"
-        },
-        "windows-nano": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "true"
-        },
         "skipRestore": {
             "type": "parameter",
             "datatype": "bool",
@@ -45,22 +35,7 @@
             "exclude": [
                 ".template.config/*",
                 "bin/**/*",
-                "obj/**/*",
-                "Dockerfile*"
-            ],
-            "modifiers": [
-                {
-                    "condition": "(windows-nano || linux-x64)",
-                    "include": [
-                        "Dockerfile"
-                    ]
-                },
-                {
-                    "condition": "(linux-x64)",
-                    "include": [
-                        "Dockerfile.amd64.debug"
-                    ]
-                }
+                "obj/**/*"
             ]
         }
     ],

content/dotnet-template-azure-iot-edge-module/FSharp/.template.config/template.json

@@ -19,16 +19,6 @@
         }
     ],
     "symbols": {
-        "linux-x64": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "true"
-        },
-        "windows-nano": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "true"
-        },
         "skipRestore": {
             "type": "parameter",
             "datatype": "bool",
@@ -45,22 +35,7 @@
             "exclude": [
                 ".template.config/*",
                 "bin/**/*",
-                "obj/**/*",
-                "Dockerfile*"
-            ],
-            "modifiers": [
-                {
-                    "condition": "(windows-nano || linux-x64)",
-                    "include": [
-                        "Dockerfile"
-                    ]
-                },
-                {
-                    "condition": "(linux-x64)",
-                    "include": [
-                        "Dockerfile.amd64.debug"
-                    ]
-                }
+                "obj/**/*"
             ]
         }
     ],