Skip to content

Commit deb4f42

Browse files
alinpahontu2912alinpahontu2912
committed
basic .net6 to .net8 updates
1 parent b87317e commit deb4f42

File tree

16 files changed

+40
-42
lines changed

16 files changed

+40
-42
lines changed

‎global.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0",
4-
"rollForward": "minor",
5-
"allowPrerelease": true
3+
"version": "8.0.405"
64
}
75
}

‎pkg/FileRestitcher/FileRestitcher.Tests/FileRestitcher.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<NoBuild>false</NoBuild>
55
<!-- The Directory.Build.props initialize TargetFrameworks to multiple targets. We have to clear that out to set only the targets we support. -->
66
<TargetFrameworks></TargetFrameworks>
77

8-
<TargetFrameworks Condition="'$(SkipNetCoreBuild)' != 'true'">net6.0</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(SkipNetCoreBuild)' != 'true'">net8.0</TargetFrameworks>
99
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' And '$(SkipNetFxBuild)' != 'true'">net472;$(TargetFrameworks)</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net6.0</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net8.0</TargetFrameworks>
1111
<IsPackable>false</IsPackable>
1212
</PropertyGroup>
1313

‎pkg/TorchSharp-cpu/TorchSharp-cpu.nupkgproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<PackageDescription>TorchSharp makes PyTorch available for .NET users. This package combines the TorchSharp package with LibTorch $(LibTorchVersion) CPU support.</PackageDescription>
66
</PropertyGroup>
77

@@ -10,13 +10,13 @@
1010
<ProjectReference Include="..\libtorch-cpu\libtorch-cpu.nupkgproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).props" />
18-
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).targets" />
19-
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net6.0\_._" />
17+
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).props" />
18+
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).targets" />
19+
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net8.0\_._" />
2020
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).props" />
2121
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).targets" />
2222
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\netstandard2.0\_._" />

‎pkg/TorchSharp-cuda-linux/TorchSharp-cuda-linux.nupkgproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<PackageDescription>TorchSharp makes PyTorch available for .NET users. This package combines the TorchSharp package with LibTorch $(LibTorchVersion) CUDA $(CudaVersionDot) support for Linux.</PackageDescription>
66
</PropertyGroup>
77

@@ -10,13 +10,13 @@
1010
<ProjectReference Include="..\libtorch-cuda-12.1-linux-x64\libtorch-cuda-12.1-linux-x64.nupkgproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).props" />
18-
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).targets" />
19-
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net6.0\_._" />
17+
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).props" />
18+
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).targets" />
19+
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net8.0\_._" />
2020
<Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.txt" Pack="true" PackagePath="LICENSE-LIBTORCH.txt" />
2121
<Content Include="$(RepoRoot)\LICENSE.txt" Pack="true" PackagePath="" />
2222
</ItemGroup>

‎pkg/TorchSharp-cuda-windows/TorchSharp-cuda-windows.nupkgproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<PackageDescription>TorchSharp makes PyTorch available for .NET users. This package combines the TorchSharp package with LibTorch $(LibTorchVersion) CUDA $(CudaVersionDot) support for Windows.</PackageDescription>
66
</PropertyGroup>
77

@@ -10,13 +10,13 @@
1010
<ProjectReference Include="..\libtorch-cuda-12.1-win-x64\libtorch-cuda-12.1-win-x64.nupkgproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).props" />
18-
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).targets" />
19-
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net6.0\_._" />
17+
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).props" />
18+
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).targets" />
19+
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net8.0\_._" />
2020
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).props" />
2121
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).targets" />
2222
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\netstandard2.0\_._" />

‎pkg/TorchSharp/TorchSharp.nupkgproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<PackageDescription>.NET Bindings for Torch. Requires reference to one of libtorch-cpu, libtorch-cuda-$(CudaVersionDot), libtorch-cuda-$(CudaVersionDot)-win-x64 or libtorch-cuda-$(CudaVersionDot)-linux-x64 version $(LibTorchPackageVersion) to execute.</PackageDescription>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).props" />
10-
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).targets" />
9+
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).props" />
10+
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).targets" />
1111
<Content Include="$(RepoRoot)\LICENSE.txt" Pack="true" PackagePath="" />
1212
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
1313
<PackageReference Include="SharpZipLib" Version="1.4.0" />

‎pkg/TorchVision/TorchVision.nupkgproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<PackageDescription>.NET Bindings for TorchVision. Requires reference to TorchSharp and one of libtorch-cpu, libtorch-cuda-$(CudaVersionDot), libtorch-cuda-$(CudaVersionDot)-win-x64 or libtorch-cuda-$(CudaVersionDot)-linux-x64 version $(LibTorchPackageVersion) to execute.</PackageDescription>
66
</PropertyGroup>
77

@@ -10,9 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).props" />
14-
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net6.0\$(MSBuildProjectName).targets" />
15-
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net6.0\_._" />
13+
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).props" />
14+
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\net8.0\$(MSBuildProjectName).targets" />
15+
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\net8.0\_._" />
1616
<Content Include="..\common\NormalPackage.props" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).props" />
1717
<Content Include="..\common\NormalPackage.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).targets" />
1818
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\netstandard2.0\_._" />

‎src/Examples.Utils/Examples.Utils.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- The Directory.Build.props initialize TargetFrameworks to multiple targets. We have to clear that out to set only the targets we support. -->
55
<TargetFrameworks></TargetFrameworks>
66
<LangVersion>9.0</LangVersion>
7-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net6.0</TargetFrameworks>
7+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net8.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/Examples/Examples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- The Directory.Build.props initialize TargetFrameworks to multiple targets. We have to clear that out to set only the targets we support. -->
88
<TargetFrameworks></TargetFrameworks>
99
<LangVersion>9.0</LangVersion>
10-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net6.0</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net8.0</TargetFrameworks>
1111
<TestUsesLibTorch>true</TestUsesLibTorch>
1212
<UseMLCodeAnalyzer>false</UseMLCodeAnalyzer>
1313
<UseStyleCopAnalyzer>false</UseStyleCopAnalyzer>

‎src/FSharp.Examples/FSharp.Examples.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TestUsesLibTorch>true</TestUsesLibTorch>
66
<TestCuda>true</TestCuda>
77
<TargetFrameworks></TargetFrameworks>
8-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net6.0</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net8.0</TargetFrameworks>
99
<TestUsesLibTorch>true</TestUsesLibTorch>
1010
<RootNamespace>Examples</RootNamespace>
1111
<AssemblyName>FSharp.Examples</AssemblyName>

0 commit comments

Comments
 (0)