Skip to content
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

Jump to bottom

feat: first pass at net6.0 framework addition #4575

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

feat: first pass at net6.0 framework addition #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad09575
feat: first pass at net6.0 framework addition
scottschreckengaust Jul 18, 2024
83439c2
fix: remove multiple target frameworks
scottschreckengaust Jul 18, 2024
ce53d3f
fix: semicolon
scottschreckengaust Jul 18, 2024
1d2b00e
fix: remove the suppression
scottschreckengaust Jul 19, 2024
405ffcb
Merge branch 'aws:main' into main
scottschreckengaust Jul 29, 2024
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 packages/jsii-pacmak/lib/targets/dotnet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { toReleaseVersion } from './version-utils';

import { TargetName } from '.';

export const TARGET_FRAMEWORK = 'netcoreapp3.1';
export const TARGET_FRAMEWORK = 'net6.0';

/**
* Build .NET packages all together, by generating an aggregate solution file
Expand Down
2 changes: 2 additions & 0 deletions packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ export class FileGenerator {
'0109', // The member 'member' does not hide an inherited member. The new keyword is not required.
].join(','),
);
// warnings.comment('Suppress Target Framework Moniker build warnings messages from the netcoreapp3.1 target framework');
// warnings.ele('SuppressTfmSupportBuildWarnings').text('true');
const xml = rootNode.end({ pretty: true, spaceBeforeSlash: true });

// Sending the xml content to the codemaker to ensure the file is written
Expand Down
Loading