Helloworld migration to net6

CSharp/Common/Microsoft.Azure.Batch.Samples.Common.csproj

@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
     <PackageReference Include="Microsoft.Azure.Batch" Version="14.0.0" />
     <PackageReference Include="Microsoft.Azure.Batch.FileStaging" Version="8.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
+
   </ItemGroup>
   <ItemGroup>
     <None Update="accountsettings.json">

CSharp/Common/SampleHelpers.cs

@@ -343,6 +343,7 @@ public static string GetFailureInfoDetails(TaskFailureInformation failureInfo)
             return builder.ToString();
         }
 
+
         public static AccountSettings LoadAccountSettings()
         {
             AccountSettings accountSettings = new ConfigurationBuilder()

CSharp/Common/accountsettings.json

@@ -1,8 +1 @@
-{
-  "batchAccountName": "",
-  "batchAccountKey": "",
-  "batchServiceUrl": "",
-  "storageAccountName": "",
-  "storageAccountKey": "",
-  "storageServiceUrl": "core.windows.net"
-}
+

CSharp/GettingStarted/01_HelloWorld/HelloWorld.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net60</TargetFramework>
     <RootNamespace>Microsoft.Azure.Batch.Samples.HelloWorld</RootNamespace>
   </PropertyGroup>
 
@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Batch" Version="14.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+    <PackageReference Include="Microsoft.Azure.Batch" Version="15.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

CSharp/GettingStarted/01_HelloWorld/settings.json

@@ -1,7 +1,7 @@
 {
-  "poolTargetNodeCount": 2,
-  "poolNodeVirtualMachineSize": "standard_d1_v2",
+  "poolTargetNodeCount": 1,
+  "poolNodeVirtualMachineSize": "Standard_A4_v2",
   "poolOSFamily": "5",
   "poolId": "HelloWorld-Pool",
-  "shouldDeleteJob":  true
+  "shouldDeleteJob": true
 }

CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/JobSubmitter.cs

@@ -23,10 +23,14 @@ public class JobSubmitter
         private readonly Settings poolsAndResourceFileSettings;
         private readonly AccountSettings accountSettings;
 
+        private const string exeFile = "SampleExe.exe";
+
         // The SimpleTask project is included via project-depedency, so the 
         // executable produced by that project will be in the same working 
         // directory as JobSubmitter at runtime.
-        private const string SimpleTaskExe = "SimpleTask.exe";
+        private string ExecutableFile = Path.Combine(@"C:\dev\git\azure-batch\azure-batch-samples\CSharp\GettingStarted\Shared\SimpleTask\bin\Release\net60\publish", exeFile);
+
+        private string TaskCommand = $"{exeFile} --arg 42";
 
         public JobSubmitter()
         {
@@ -139,7 +143,7 @@ private async Task CreatePoolIfNotExistAsync(BatchClient batchClient, CloudStora
             // Create a new start task to facilitate pool-wide file management or installation.
             // In this case, we just add a single dummy data file to the StartTask.
             string localSampleFilePath = GettingStartedCommon.GenerateTemporaryFile("StartTask.txt", "hello from Batch PoolsAndResourceFiles sample!");
-            List<string> files = new List<string> { localSampleFilePath };
+            List<string> files = new List<string> { localSampleFilePath, ExecutableFile };
 
             List<ResourceFile> resourceFiles = await SampleHelpers.UploadResourcesAndCreateResourceFileReferencesAsync(
                 cloudStorageAccount,
@@ -169,15 +173,15 @@ private async Task<HashSet<string>> SubmitJobAsync(BatchClient batchClient, Clou
             CloudJob unboundJob = batchClient.JobOperations.CreateJob();
             unboundJob.Id = jobId;
             unboundJob.PoolInformation = new PoolInformation() { PoolId = this.poolsAndResourceFileSettings.PoolId };
-
+            
             // Commit Job to create it in the service
             await unboundJob.CommitAsync();
 
             List<CloudTask> tasksToRun = new List<CloudTask>();
 
             // Create a task which requires some resource files
-            CloudTask taskWithFiles = new CloudTask("task_with_file1", SimpleTaskExe);
-
+            CloudTask taskWithFiles = new CloudTask("task_with_file1", TaskCommand);
+            
             // Set up a collection of files to be staged -- these files will be uploaded to Azure Storage
             // when the tasks are submitted to the Azure Batch service.
             taskWithFiles.FilesToStage = new List<IFileStagingProvider>();
@@ -194,7 +198,7 @@ private async Task<HashSet<string>> SubmitJobAsync(BatchClient batchClient, Clou
             // add the files as a task dependency so they will be uploaded to storage before the task 
             // is submitted and downloaded to the node before the task starts execution.
             FileToStage helloWorldFile = new FileToStage(localSampleFile, fileStagingStorageAccount);
-            FileToStage simpleTaskFile = new FileToStage(SimpleTaskExe, fileStagingStorageAccount);
+            FileToStage simpleTaskFile = new FileToStage(ExecutableFile, fileStagingStorageAccount);
 
             // When this task is added via JobOperations.AddTaskAsync below, the FilesToStage are uploaded to storage once.
             // The Batch service does not automatically delete content from your storage account, so files added in this 

CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/JobSubmitter.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Azure.Batch.Samples.PoolsAndResourceFiles</RootNamespace>
   </PropertyGroup>
 

CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/settings.json

@@ -1,6 +1,6 @@
 {
-  "poolTargetNodeCount": 2,
-  "poolNodeVirtualMachineSize": "standard_d1_v2",
+  "poolTargetNodeCount": 1,
+  "poolNodeVirtualMachineSize": "Standard_A4_v2",
   "poolOSFamily": "5",
   "poolId": "PoolsAndResourceFilesPool",
   "shouldDeleteJob": true,

CSharp/GettingStarted/Shared/SimpleTask/Program.cs

@@ -14,6 +14,14 @@ public static void Main(string[] args)
             {
                 Console.WriteLine("Found a file: {0}", file);
             }
+
+            foreach (var file in Directory.EnumerateDirectories("Z:\\"))
+            {
+                Console.WriteLine("Found a file: {0}", file);
+            }
+
+            Console.WriteLine($"Started with arg: {args[0]}");
+
         }
     }
 }

CSharp/GettingStarted/Shared/SimpleTask/SimpleTask.csproj

@@ -2,8 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Azure.Batch.Samples.SimpleTask</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="Properties\PublishProfiles\" />
+  </ItemGroup>
+
 </Project>