Skip to content

Commit

Permalink
chore(repo): migrate-next
Browse files Browse the repository at this point in the history
  • Loading branch information
AgentEnder committed Feb 24, 2023
1 parent d95a3ff commit d4fca4d
Show file tree
Hide file tree
Showing 8 changed files with 266 additions and 223 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"swashbuckle.aspnetcore.cli": {
"version": "6.2.3",
"version": "6.5.0",
"commands": ["swagger"]
}
}
Expand Down
4 changes: 3 additions & 1 deletion .nx-dotnet.rc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"nugetPackages": {},
"nugetPackages": {
"Swashbuckle.AspNetCore": "6.5.0"
},
"inferProjects": false
}
2 changes: 1 addition & 1 deletion demo/apps/webapi/NxDotnet.Test.Webapi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "6.0.400"
}
}
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@docusaurus/preset-classic": "^2.2.0",
"@docusaurus/theme-search-algolia": "^2.1.0",
"@mdx-js/react": "^1.6.21",
"@nrwl/devkit": "15.7.1",
"@nrwl/devkit": "15.8.0-beta.2",
"@swc/helpers": "~0.3.3",
"@trumbitta/nx-plugin-openapi": "^1.12.1",
"@types/xmldoc": "^1.1.6",
Expand All @@ -46,17 +46,17 @@
"@commitlint/cli": "^16.2.1",
"@commitlint/config-conventional": "^17.1.0",
"@commitlint/types": "^16.2.1",
"@nrwl/cypress": "15.7.1",
"@nrwl/eslint-plugin-nx": "15.7.1",
"@nrwl/jest": "15.7.1",
"@nrwl/js": "15.7.1",
"@nrwl/linter": "15.7.1",
"@nrwl/node": "15.7.1",
"@nrwl/nx-cloud": "15.0.3",
"@nrwl/nx-plugin": "15.7.1",
"@nrwl/react": "15.7.1",
"@nrwl/web": "15.7.1",
"@nrwl/workspace": "15.7.1",
"@nrwl/cypress": "15.8.0-beta.2",
"@nrwl/eslint-plugin-nx": "15.8.0-beta.2",
"@nrwl/jest": "15.8.0-beta.2",
"@nrwl/js": "15.8.0-beta.2",
"@nrwl/linter": "15.8.0-beta.2",
"@nrwl/node": "15.8.0-beta.2",
"@nrwl/nx-cloud": "15.1.0",
"@nrwl/nx-plugin": "15.8.0-beta.2",
"@nrwl/react": "15.8.0-beta.2",
"@nrwl/web": "15.8.0-beta.2",
"@nrwl/workspace": "15.8.0-beta.2",
"@nx-plus/docusaurus": "15.0.0-rc.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@semantic-release/changelog": "^6.0.1",
Expand Down Expand Up @@ -103,7 +103,7 @@
"lint-staged": "^13.0.3",
"memfs": "3.4.13",
"node-fetch": "2.6.6",
"nx": "15.7.1",
"nx": "15.8.0-beta.2",
"openapi-types": "^11.0.1",
"prettier": "2.7.1",
"react-refresh": "^0.10.0",
Expand All @@ -116,7 +116,7 @@
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"tslib": "^2.3.1",
"typescript": "4.8.4",
"typescript": "4.9.5",
"url-loader": "^4.1.1",
"verdaccio": "^5.15.2",
"webpack": "^5.75.0",
Expand Down
1 change: 1 addition & 0 deletions tools/scripts/hooks/check-if-using-yarn.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const { basename } = require('path');
exports.checkIfYarn = () => {
return (
process.env.FORCE_YARN_CHECK === 'true' ||
process.env.NX_CLI_SET === 'true' ||
basename(process.env.npm_execpath || '').startsWith('yarn')
);
};
30 changes: 21 additions & 9 deletions tools/scripts/publish-dev/index.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
import { readJson } from '../../utils';
import { PublishAll } from '../publish-all';
import { publishAll } from '../publish-all';

export function main(all = false, specific?: string) {
const rootPkg = readJson('package.json');
import * as parser from 'yargs-parser';

const [prev, tagSpec] = rootPkg.version.split('-');
let [tag, rev] = tagSpec ? tagSpec.split('.') : ['dev', '0'];
export function main(version: string) {
const rootPkg = readJson('package.json');
const [next, tagSpec]: [string, string | null] = rootPkg.version.startsWith(
version,
)
? rootPkg.version.split('-')
: [version, null];
let [tag, rev] = tagSpec ? tagSpec.split('.') : ['beta', '0'];
rev = (parseInt(rev) + 1).toString();
rev = rev === 'NaN' ? '0' : rev;
const newVersion = `${prev}-${tag}.${rev}`;
console.log('New Version: ', { newVersion, prev, tag, rev });
const newVersion = `${next}-${tag}.${rev}`;

PublishAll(newVersion, tag);
publishAll(newVersion, tag);
}

if (require.main === module) {
main();
const { version } = parser(process.argv, {
string: ['version'],
}) as parser.Arguments & {
version: string;
};
if (!version) {
throw new Error('Version is required');
}
main(version);
}
Loading

0 comments on commit d4fca4d

Please sign in to comment.