Merge pull request #93 from rido-min/net7

Update to .NET 7, new Docker toolchain

Author: marianan

IotEdgeModuleTemplate.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34004.107
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleModule", "content\dotnet-template-azure-iot-edge-module\CSharp\SampleModule.csproj", "{076FF2B0-9939-48A5-A2A6-B2003637A744}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{2EA37308-0FBE-4C6D-B532-3671D33ED2BB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{076FF2B0-9939-48A5-A2A6-B2003637A744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{076FF2B0-9939-48A5-A2A6-B2003637A744}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{076FF2B0-9939-48A5-A2A6-B2003637A744}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{076FF2B0-9939-48A5-A2A6-B2003637A744}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EA37308-0FBE-4C6D-B532-3671D33ED2BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EA37308-0FBE-4C6D-B532-3671D33ED2BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EA37308-0FBE-4C6D-B532-3671D33ED2BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EA37308-0FBE-4C6D-B532-3671D33ED2BB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {04A15845-D8E7-4F71-95F8-8B58F9FC5627}
+	EndGlobalSection
+EndGlobal

Microsoft.Azure.IoT.Edge.Module.nuspec

@@ -2,7 +2,7 @@
 <package>
     <metadata>
     <id>Microsoft.Azure.IoT.Edge.Module</id>
-    <version>3.2.0</version>
+    <version>7.0.0</version>
     <title>Azure IoT Edge Module</title>
     <authors>Microsoft</authors>
     <owners>microsoft, nugetazureiotedge</owners>

README.md

@@ -9,12 +9,12 @@ The template will set up all necessary files for you to focus on functionality p
 
 ## Get Started
 
-Make sure you have [.NET 6.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) installed.
+Make sure you have [.NET 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) installed.
 
 Run `dotnet` command to install the template:
 
 ```
-dotnet new -i Microsoft.Azure.IoT.Edge.Module
+dotnet new install Microsoft.Azure.IoT.Edge.Module
 ```
 You could find the template with short name *aziotedgemodule* in output:
 
@@ -45,52 +45,36 @@ MVC ViewStart                                     viewstart
 Check out the template details:
 ```
 PS C:\> dotnet new aziotedgemodule --help
-Usage: new [options]
-
-Options:
-  -h, --help          Displays help for this command.
-  -l, --list          Lists templates containing the specified name. If no name is specified, lists all templates.
-  -n, --name          The name for the output being created. If no name is specified, the name of the current directory is used.
-  -o, --output        Location to place the generated output.
-  -i, --install       Installs a source or a template pack.
-  -u, --uninstall     Uninstalls a source or a template pack.
-  --type              Filters templates based on available types. Predefined values are "project", "item" or "other".
-  --force             Forces content to be generated even if it would change existing files.
-  -lang, --language   Specifies the language of the template to create.
-
-
 Azure IoT Edge Module (C#)
 Author: Microsoft
-Options:
-  -s|--skipRestore
-                      bool - Optional
-                      Default: false
-  
-  -r|--repository
-                      string - Optional
-                      Default: <registry>/<repo-name> 
-
-  -lang|--language
-                      string - Optional
-                      Default: C#
 
-```
+Usage:
+  dotnet new aziotedgemodule [options] [template options]
 
-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.
+Options:
+  -n, --name <name>       The name for the output being created. If no name is specified, the name of the output
+                          directory is used.
+  -o, --output <output>   Location to place the generated output.
+  --dry-run               Displays a summary of what would happen if the given command line were run if it would result
+                          in a template creation.
+  --force                 Forces content to be generated even if it would change existing files.
+  --no-update-check       Disables checking for the template package updates when instantiating a template.
+  --project <project>     The project that should be used for context evaluation.
+  -lang, --language <C#>  Specifies the template language to instantiate.
+  --type <project>        Specifies the template type to instantiate.
+
+Template options:
+  -s, --skipRestore              Type: bool
+                                 Default: false
+  -r, --repository <repository>  Type: string
+                                 Default: <registry>/<repo-name>
 
-Now create the Azure IoT Edge module by the template with name:
+```
 
 ```
-dotnet new aziotedgemodule -n <your_module_name>
+dotnet new aziotedgemodule -o <your_module_name>
 ```
 
-Optionally, to create an F# module use the `-lang` or `--language` flag as follows:
-
-```
-dotnet new aziotedgemodule -lang F# -n <your_module_name>
-``` 
 
 ## Support
 The team monitors the issue section on regular basis and will try to assist with troubleshooting or questions related IoT Edge tools on a best effort basis.

Test/Test.cs

@@ -47,12 +47,11 @@ private static string BeforeEach(string lang, string repository, bool skipRestor
 
         [Theory]
         [InlineData(CSharp, true)]
-        [InlineData(CSharp, false)]
         public void TestArchitecture(string lang, bool skipRestore)
         {
             var repository = "test.azurecr.io/test";
             var scaffoldName = BeforeEach(lang, repository, skipRestore);
-            var filesToCheck = new List<string> { ".gitignore", "module.json", "Dockerfile.amd64", "Dockerfile.amd64.debug", "Dockerfile.arm32v7", "Dockerfile.arm32v7.debug", "Dockerfile.windows-amd64", "Dockerfile.arm64v8", ".dockerignore" };
+            var filesToCheck = new List<string> { ".gitignore" };
 
             if (skipRestore)
             {
@@ -65,17 +64,14 @@ public void TestArchitecture(string lang, bool skipRestore)
 
             if (lang == CSharp)
             {
-                filesToCheck.AddRange(new List<string> { "Program.cs", scaffoldName + ".csproj", "Dockerfile.arm64v8.debug" });
+                filesToCheck.AddRange(new List<string> { "Program.cs", scaffoldName + ".csproj"});
             }
 
             foreach (var file in filesToCheck)
             {
                 Assert.True(File.Exists(Path.Combine(scaffoldName, file)));
             }
-
-            string text = File.ReadAllText(Path.Combine(scaffoldName, "module.json"));
-            Assert.Contains(repository, text);
-
+            
             Directory.Delete(scaffoldName, true);
         }
     }

Test/Test.csproj

@@ -1,14 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>

azure-pipelines.yml

@@ -12,6 +12,11 @@ pool:
     - ImageOverride -equals MMSUbuntu18.04TLS
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Install .NET Core SDK'
+  inputs:
+    version: 7.x
+
 - task: NuGetToolInstaller@1
   inputs:
     versionSpec: