Skip to content

Set target framework to 6.0 #110

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

Open
JeremyAnsel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set target framework to 6.0 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04319dd
Add System.CommandLine
JeremyAnsel Apr 2, 2025
b89df0d
Set TargetFramework to 6.0
JeremyAnsel Apr 2, 2025
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 Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<PropertyGroup>
<NerdbankGitVersioningVersion>2.3.38</NerdbankGitVersioningVersion>
<NerdbankGitVersioningVersion>3.7.115</NerdbankGitVersioningVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions NuGet.Config
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/ShaderGen.App/ShaderGen.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -16,8 +16,8 @@

<ItemGroup>
<ProjectReference Include="..\ShaderGen\ShaderGen.csproj" />
<ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" />
<PackageReference Include="System.CommandLine" Version="0.1.0-e170407-3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/ShaderGen.Build/ShaderGen.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PublishedToolPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\ShaderGen.App\netcoreapp2.0\publish</PublishedToolPath>
<PublishedToolPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\ShaderGen.App\net6.0\publish</PublishedToolPath>

<!-- Nuget info -->
<PackageId>ShaderGen.Build</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/ShaderGen.Primitives/ShaderGen.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>ShaderGen</RootNamespace>
<!-- Package stuff -->
<PackageId>ShaderGen.Primitives</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/ShaderGen.Tests/ShaderGen.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<StartupObject>Program</StartupObject>
</PropertyGroup>
Expand Down
18 changes: 16 additions & 2 deletions src/ShaderGen.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
# Visual Studio Version 17
VisualStudioVersion = 17.13.35919.96 d17.13
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderGen", "ShaderGen\ShaderGen.csproj", "{89E900C2-3DCF-434B-B807-AEB9F55BF6F1}"
EndProject
Expand All @@ -12,6 +12,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderGen.Primitives", "Sha
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderGen.Build", "ShaderGen.Build\ShaderGen.Build.csproj", "{F960509E-C4BF-4518-937E-98B96AF0757F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CommandLine", "System.CommandLine\System.CommandLine.csproj", "{80F7C944-4B94-6A98-F407-939315CA2DC4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -82,6 +84,18 @@ Global
{F960509E-C4BF-4518-937E-98B96AF0757F}.Release|x64.Build.0 = Release|Any CPU
{F960509E-C4BF-4518-937E-98B96AF0757F}.Release|x86.ActiveCfg = Release|Any CPU
{F960509E-C4BF-4518-937E-98B96AF0757F}.Release|x86.Build.0 = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|x64.ActiveCfg = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|x64.Build.0 = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|x86.ActiveCfg = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Debug|x86.Build.0 = Debug|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|Any CPU.Build.0 = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|x64.ActiveCfg = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|x64.Build.0 = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|x86.ActiveCfg = Release|Any CPU
{80F7C944-4B94-6A98-F407-939315CA2DC4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion src/ShaderGen/ShaderGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<!-- Package stuff -->
<PackageId>ShaderGen</PackageId>
<Description>Translates C# code to HLSL and GLSL shader code.</Description>
Expand Down
7 changes: 7 additions & 0 deletions src/System.CommandLine/Properties/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("System.CommandLine.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")]
Loading