Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelgsharp merged 4 commits into from
May 5, 2023
Merged

Update ML.NET to work with .NET8 #6641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e81256c
updates for .net8
michaelgsharp May 1, 2023
742fcc0
Updates for .net 8
michaelgsharp May 1, 2023
fc0277c
fixed net6 to net6.0
michaelgsharp May 3, 2023
3b67dd5
fixed approval tests
michaelgsharp May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<NoWarn>$(NoWarn);MSB3270</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>false</SignAssembly>
<!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down
19 changes: 15 additions & 4 deletions docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
string modelLocation = "resnet_v2_101_299_frozen.pb";
if (!File.Exists(modelLocation))
{
modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
downloadTask.Wait();
modelLocation = downloadTask.Result;
Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
public float[] output { get; set; }
}

private static string Download(string baseGitPath, string dataFile)
private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.
{
using (WebClient client = new WebClient())
if (File.Exists(dataFile))
return dataFile;

using (HttpClient client = new HttpClient())
{
client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
using (var fs = new FileStream(dataFile, FileMode.CreateNew))
{
await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.
}
}

return dataFile;
Expand Down
19 changes: 12 additions & 7 deletions ...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
string fileName = "flower_photos_small_set.zip";
string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

Download(url, imagesDownloadFolder, fileName);
Download(url, imagesDownloadFolder, fileName).Wait();
UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

return Path.GetFileNameWithoutExtension(fileName);
}

// Download file to destination directory from input URL.
public static bool Download(string url, string destDir, string destFileName)
public static async Task<bool> Download(string url, string destDir, string destFileName)
{
if (destFileName == null)
destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
return false;
}

var wc = new WebClient();
Console.WriteLine($"Downloading {relativeFilePath}");
var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
{
Thread.Sleep(1000);
Console.Write(".");
var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
{
await response.CopyToAsync(fs);
}
}

Console.WriteLine("");
Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down
19 changes: 12 additions & 7 deletions ...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
// https://github.com/YoongiKim/CIFAR-10-images
string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

Download(url, imagesDownloadFolder, fileName);
Download(url, imagesDownloadFolder, fileName).Wait();
UnZip(Path.Combine(imagesDownloadFolder, fileName),
imagesDownloadFolder);

return Path.GetFileNameWithoutExtension(fileName);
}

// Download file to destination directory from input URL.
public static bool Download(string url, string destDir, string destFileName)
public static async Task<bool> Download(string url, string destDir, string destFileName)
{
if (destFileName == null)
destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
return false;
}

var wc = new WebClient();
Console.WriteLine($"Downloading {relativeFilePath}");
var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
{
Thread.Sleep(1000);
Console.Write(".");
var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
{
await response.CopyToAsync(fs);
}
}

Console.WriteLine("");
Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down
19 changes: 12 additions & 7 deletions .../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
string fileName = "flower_photos_small_set.zip";
string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

Download(url, imagesDownloadFolder, fileName);
Download(url, imagesDownloadFolder, fileName).Wait();
UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

return Path.GetFileNameWithoutExtension(fileName);
}

// Download file to destination directory from input URL.
public static bool Download(string url, string destDir, string destFileName)
public static async Task<bool> Download(string url, string destDir, string destFileName)
{
if (destFileName == null)
destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
return false;
}

var wc = new WebClient();
Console.WriteLine($"Downloading {relativeFilePath}");
var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
{
Thread.Sleep(1000);
Console.Write(".");
var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
{
await response.CopyToAsync(fs);
}
}

Console.WriteLine("");
Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down
19 changes: 12 additions & 7 deletions ...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
string fileName = "flower_photos_small_set.zip";
string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

Download(url, imagesDownloadFolder, fileName);
Download(url, imagesDownloadFolder, fileName).Wait();
UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

return Path.GetFileNameWithoutExtension(fileName);
}

// Download file to destination directory from input URL.
public static bool Download(string url, string destDir, string destFileName)
public static async Task<bool> Download(string url, string destDir, string destFileName)
{
if (destFileName == null)
destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
return false;
}

var wc = new WebClient();
Console.WriteLine($"Downloading {relativeFilePath}");
var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
{
Thread.Sleep(1000);
Console.Write(".");
var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
{
await response.CopyToAsync(fs);
}
}

Console.WriteLine("");
Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>false</SignAssembly>
<!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
<ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
<BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
<DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
<DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

<!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
<Target Name="AddMDAIToInteractiveExtensionsFolder">
<MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
<MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
<!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
<Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
</MSBuild>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
public virtual string TransformText()
{
this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
"utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
"utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
this.Write("\" />\r\n");
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update ML.NET to work with .NET8#6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 4 commits into

from

May 5, 2023
 Merged


Update ML.NET to work with .NET8
#6641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e81256c

updates for .net8


michaelgsharp May 1, 2023
742fcc0

Updates for .net 8


michaelgsharp May 1, 2023
fc0277c

fixed net6 to net6.0


michaelgsharp May 3, 2023
3b67dd5

fixed approval tests


michaelgsharp May 3, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn);MSB3270</NoWarn>
 </PropertyGroup>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

19 changes: 15 additions & 4 deletions
docs/samples/Microsoft.ML.Samples/Dynamic/TensorFlow/ImageClassification.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Microsoft.ML;
Expand All@@ -23,7 +25,9 @@ public static void Example()
 string modelLocation = "resnet_v2_101_299_frozen.pb";
 if (!File.Exists(modelLocation))
 {
 modelLocation = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 var downloadTask = Download(@"https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/resnet_v2_101.tgz", @"resnet_v2_101_299_frozen.tgz");
 downloadTask.Wait();
 modelLocation = downloadTask.Result;
 Unzip(Path.Join(Directory.GetCurrentDirectory(), modelLocation),
 Directory.GetCurrentDirectory());

Expand DownExpand Up@@ -111,11 +115,18 @@ class OutputScores
 public float[] output { get; set; }
 }

 private static string Download(string baseGitPath, string dataFile)
 private static async Task<string> Download(string baseGitPath, string dataFile)
Comment thread
michaelgsharp marked this conversation as resolved.

 {
 using (WebClient client = new WebClient())
 if (File.Exists(dataFile))
 return dataFile;

 using (HttpClient client = new HttpClient())
 {
 client.DownloadFile(new Uri($"{baseGitPath}"), dataFile);
 var response = await client.GetStreamAsync(new Uri($"{baseGitPath}")).ConfigureAwait(false);
 using (var fs = new FileStream(dataFile, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs).ConfigureAwait(false);
Comment thread
michaelgsharp marked this conversation as resolved.

 }
 }

 return dataFile;
Expand Down

19 changes: 12 additions & 7 deletions
...namic/Trainers/MulticlassClassification/ImageClassification/ImageClassificationDefault.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -244,14 +245,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -266,14 +267,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...ssClassification/ImageClassification/LearningRateSchedulingCifarResnetTransferLearning.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -275,15 +276,15 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 // https://github.com/YoongiKim/CIFAR-10-images
 string url = $"https://github.com/YoongiKim/CIFAR-10-images/archive/refs/heads/master.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName),
 imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -298,14 +299,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
.../MulticlassClassification/ImageClassification/ResnetV2101TransferLearningEarlyStopping.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -232,14 +233,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -254,14 +255,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

19 changes: 12 additions & 7 deletions
...MulticlassClassification/ImageClassification/ResnetV2101TransferLearningTrainTestSplit.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ML;
Expand DownExpand Up@@ -253,14 +254,14 @@ public static string DownloadImageSet(string imagesDownloadFolder)
 string fileName = "flower_photos_small_set.zip";
 string url = $"https://aka.ms/mlnet-resources/datasets/flower_photos_small_set.zip";

 Download(url, imagesDownloadFolder, fileName);
 Download(url, imagesDownloadFolder, fileName).Wait();
 UnZip(Path.Combine(imagesDownloadFolder, fileName), imagesDownloadFolder);

 return Path.GetFileNameWithoutExtension(fileName);
 }

 // Download file to destination directory from input URL.
 public static bool Download(string url, string destDir, string destFileName)
 public static async Task<bool> Download(string url, string destDir, string destFileName)
 {
 if (destFileName == null)
 destFileName = url.Split(Path.DirectorySeparatorChar).Last();
Expand All@@ -275,14 +276,18 @@ public static bool Download(string url, string destDir, string destFileName)
 return false;
 }

 var wc = new WebClient();
 Console.WriteLine($"Downloading {relativeFilePath}");
 var download = Task.Run(() => wc.DownloadFile(url, relativeFilePath));
while (!download.IsCompleted)

using (HttpClient client = new HttpClient())
 {
 Thread.Sleep(1000);
 Console.Write(".");
 var response = await client.GetStreamAsync(new Uri($"{url}")).ConfigureAwait(false);

 using (var fs = new FileStream(relativeFilePath, FileMode.CreateNew))
 {
 await response.CopyToAsync(fs);
 }
 }

 Console.WriteLine("");
 Console.WriteLine($"Downloaded {relativeFilePath}");

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <SignAssembly>false</SignAssembly>
 <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@
 <ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
 <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 <IsPackable>false</IsPackable>
 </PropertyGroup>

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@

 <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
 <Target Name="AddMDAIToInteractiveExtensionsFolder">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=netcoreapp3.1">
 <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
 <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
 <Output TaskParameter="TargetOutputs" ItemName="_ItemsToIncludeForInteractive" />
 </MSBuild>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ internal partial class PredictProject : PredictProjectBase
 public virtual string TransformText()
 {
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
 "utType>\r\n <TargetFramework>netcoreapp3.1</TargetFramework>\r\n </PropertyGroup" +
 "utType>\r\n <TargetFramework>net6.0</TargetFramework>\r\n </PropertyGroup" +
 ">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"");
 this.Write(this.ToStringHelper.ToStringWithCulture(StablePackageVersion));
 this.Write("\" />\r\n");
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CodeGenerator/Templates/Console/PredictProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>netcoreapp3.1</TargetFramework>
 <TargetFramework>net6.0</TargetFramework>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="<#= StablePackageVersion #>" />
Expand Down
Loading