Skip to content

Commit a450579

Browse files
claudiamurialdoBeta Bot
authored andcommitted
Cherry pick branch 'genexuslabs:upd/migrate-to-slnx' into beta
1 parent 0889858 commit a450579

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/External-Storage-Tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ jobs:
6565
- name: Install libgdiplus
6666
run: sudo apt-get install -y libgdiplus
6767

68-
- name: Create temporary solution with .NET 8 projects
68+
- name: Create temporary solution with .NET 10 projects
6969
run: |
7070
dotnet new sln --name $SolutionFileName --output dotnet --force
71-
dotnet msbuild dotnet/DotNetStandardClasses.slnx /t:DumpProjectsAndCoreTests -p:DumpSolutionName=$SolutionFileName -p:DumpSolutionExtension=slnx /m:1 -p:DumpSolutionTargetFrameworkDefault=net8
71+
dotnet msbuild dotnet/DotNetStandardClasses.slnx /t:DumpProjectsAndCoreTests -p:DumpSolutionName=$SolutionFileName -p:DumpSolutionExtension=slnx /m:1 -p:DumpSolutionTargetFrameworkDefault=net10
7272
7373
- name: Restore packages
7474
run: dotnet restore $SolutionFile

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ This repository contains projects for .NET and .NET Framework. It is organized a
6666
# How to build
6767

6868
## Requirements
69-
- Visual Studio 2022 (17.8 or higher).
69+
- Visual Studio 2025 (17.14 or higher).
7070
- .NET 10
7171
- .NET Framework 4.7 DevPack
7272

@@ -87,7 +87,7 @@ It compiles the solution and copies all the .NET Framework assemblies to the fol
8787

8888
- ```dotnet msbuild /p:TF=net10.0 /p:DeployDirectory=C:\KB\NetModel\web\bin DotNetStandardClasses.slnx```
8989

90-
It compiles the solution and copies all the .NET 8 assemblies to the folder C:\KB\NetModel\web\bin.
90+
It compiles the solution and copies all the .NET 10 assemblies to the folder C:\KB\NetModel\web\bin.
9191

9292
- TF: target framework that will be deployed. Valid values are: `net462` (for GeneXus NET Framework generator) and `net10.0` (for GeneXus NET generator).
9393
- DeployDirectory: specifies the target directory to copy assemblies.

dotnet/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<DumpSolutionName>TempSolution</DumpSolutionName>
1717
<DumpSolutionExtension>slnx</DumpSolutionExtension>
18-
<DumpSolutionTargetFrameworkDefault>net8</DumpSolutionTargetFrameworkDefault>
18+
<DumpSolutionTargetFrameworkDefault>net10</DumpSolutionTargetFrameworkDefault>
1919
</PropertyGroup>
2020

2121

@@ -34,7 +34,7 @@
3434
</Target>
3535

3636
<Target Name="PublishForAnalyzer">
37-
<Exec Command="dotnet publish $(MSBuildThisFileDirectory)$(DumpSolutionName).$(DumpSolutionExtension) --configuration Debug -o $(MSBuildThisFileDirectory)..\.out -p:Publishing=true -p:SignAssembly=false --framework net8.0"></Exec>
37+
<Exec Command="dotnet publish $(MSBuildThisFileDirectory)$(DumpSolutionName).$(DumpSolutionExtension) --configuration Debug -o $(MSBuildThisFileDirectory)..\.out -p:Publishing=true -p:SignAssembly=false --framework net10.0"></Exec>
3838
</Target>
3939

4040
</Project>

dotnet/src/dotnetcore/DynService/Dynamo/DynService.DynamoDB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>$(NetVersions)</TargetFrameworks>
44
<DefineConstants>NETCORE</DefineConstants>
55
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
66
<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>

dotnet/src/dotnetcore/GxPdfReportsCS.Itext4/GxPdfReportsCS.Itext4.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<NoWarn>1701;1702;NU1701</NoWarn>
55
<DefineConstants>NETCORE;ITEXT4</DefineConstants>
66
<AssemblyName>GxPdfReportsCS</AssemblyName>

dotnet/test/DotNetExtensions/AzureFunctions/amyprocedurehandler/amyprochandler.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<AssemblyName>amyprochandler</AssemblyName>
66
</PropertyGroup>
77

dotnet/test/DotNetExtensions/AzureFunctions/test/AzureInteropTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />

dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class PackageVersionTest
1919
private const string PACKAGE_VERSION_ATTRIBUTE_NAME = "Version";
2020
private const string TARGET_FRAMEWORK = "Project/PropertyGroup/TargetFramework";
2121
private const string TARGET_FRAMEWORKS = "Project/PropertyGroup/TargetFrameworks";
22-
private const string NET8 = "net8.0";
22+
private const string NET10 = "net10.0";
2323
private const string NET_FRAMEWORK = "net462";
2424
private static HashSet<string> ExcludedFromTransitiveDependenciesControl = new HashSet<string> {"runtime"};
2525
private static HashSet<string> ProjectTemporaryExcludedFromDependenciesControl = new HashSet<string> { "GeneXus.Deploy.AzureFunctions.Handlers.csproj", "AzureFunctionsTest.csproj" };
@@ -35,7 +35,7 @@ public class PackageVersionTest
3535
[Fact]
3636
public void TestPackageVersionConsistencyAcrossNETProjectsAndTransitives()
3737
{
38-
TestPackageVersionConsistencyAcrossProjects(NET8, true);
38+
TestPackageVersionConsistencyAcrossProjects(NET10, true);
3939
}
4040
/// <summary>
4141
/// Tests that all referenced packages have the same version by doing:
@@ -47,7 +47,7 @@ public void TestPackageVersionConsistencyAcrossNETProjectsAndTransitives()
4747
[Fact]
4848
public void TestPackageVersionConsistencyAcrossNETProjects()
4949
{
50-
TestPackageVersionConsistencyAcrossProjects(NET8, false);
50+
TestPackageVersionConsistencyAcrossProjects(NET10, false);
5151
}
5252
[Fact]
5353
public void TestPackageVersionConsistencyAcrossNETFrameworkProjects()
@@ -100,15 +100,15 @@ private void TestPackageVersionConsistencyAcrossProjects(string targetFramework,
100100
{
101101
XmlAttribute condition = packageNode.ParentNode.Attributes["Condition"];
102102
if (condition != null) {
103-
if (targetFramework == NET8 && condition.Value.Contains($"=='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase))
103+
if (targetFramework == NET10 && condition.Value.Contains($"=='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase))
104104
{
105105
continue;
106106
}
107-
else if (targetFramework == NET8 && condition.Value.Contains($"!='{NET8}'", StringComparison.OrdinalIgnoreCase))
107+
else if (targetFramework == NET10 && condition.Value.Contains($"!='{NET10}'", StringComparison.OrdinalIgnoreCase))
108108
{
109109
continue;
110110
}
111-
else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"=='{NET8}'", StringComparison.OrdinalIgnoreCase))
111+
else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"=='{NET10}'", StringComparison.OrdinalIgnoreCase))
112112
{
113113
continue;
114114
}

0 commit comments

Comments
 (0)