Merge pull request #79 from rainersigwald/preview7

baronfel · web-flow · commit 6e085907fa91 · 2022-08-09T15:37:09.000-05:00
Adopt .NET 7 preview 7
diff --git a/Microsoft.NET.Build.Containers/LocalDocker.cs b/Microsoft.NET.Build.Containers/LocalDocker.cs
@@ -50,7 +50,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St
 
             // Stuff that (uncompressed) tarball into the image tar stream
             string layerTarballPath = $"{d.Digest.Substring("sha256:".Length)}/layer.tar";
-            writer.WriteEntry(localPath, layerTarballPath);
+            await writer.WriteEntryAsync(localPath, layerTarballPath);
             layerTarballPaths.Add(layerTarballPath);
         }
 
@@ -64,7 +64,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St
                 DataStream = configStream
             };
 
-            writer.WriteEntry(configEntry); // TODO: asyncify these when API available (Preview 7)
+            await writer.WriteEntryAsync(configEntry);
         }
 
         // Add manifest
@@ -87,7 +87,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St
                 DataStream = manifestStream
             };
 
-            writer.WriteEntry(manifestEntry); // TODO: asyncify these when API available (Preview 7)
+            await writer.WriteEntryAsync(manifestEntry);
         }
     }
 }
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.6.22352.1",
+    "version": "7.0.100-preview.7.22377.5",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St`
`50`	`50`
`51`	`51`	`// Stuff that (uncompressed) tarball into the image tar stream`
`52`	`52`	`string layerTarballPath = $"{d.Digest.Substring("sha256:".Length)}/layer.tar";`
`53`		`- writer.WriteEntry(localPath, layerTarballPath);`
	`53`	`+ await writer.WriteEntryAsync(localPath, layerTarballPath);`
`54`	`54`	`layerTarballPaths.Add(layerTarballPath);`
`55`	`55`	`}`
`56`	`56`
`@@ -64,7 +64,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St`
`64`	`64`	`DataStream = configStream`
`65`	`65`	`};`
`66`	`66`
`67`		`- writer.WriteEntry(configEntry); // TODO: asyncify these when API available (Preview 7)`
	`67`	`+ await writer.WriteEntryAsync(configEntry);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// Add manifest`
`@@ -87,7 +87,7 @@ public static async Task WriteImageToStream(Image x, string name, string tag, St`
`87`	`87`	`DataStream = manifestStream`
`88`	`88`	`};`
`89`	`89`
`90`		`- writer.WriteEntry(manifestEntry); // TODO: asyncify these when API available (Preview 7)`
	`90`	`+ await writer.WriteEntryAsync(manifestEntry);`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.100-preview.6.22352.1",`
	`3`	`+ "version": "7.0.100-preview.7.22377.5",`
`4`	`4`	`"allowPrerelease": true,`
`5`	`5`	`"rollForward": "latestMajor"`
`6`	`6`	`}`