Skip to content

Commit

Permalink
Merge remote-tracking branch 'ms/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-un committed Apr 6, 2020
2 parents 1e2c329 + 9a7079c commit 408dae3
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch

- template: templates/configure-git.yml

- task: CmdLine@2
displayName: yarn install
inputs:
Expand Down
9 changes: 9 additions & 0 deletions .ado/templates/configure-git.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

steps:

- task: CmdLine@2
displayName: Configure git
inputs:
script: |
git config --global user.email "53619745+rnbot@users.noreply.github.com"
git config --global user.name "React-Native Bot"

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native",
"version": "0.60.0-microsoft.67",
"version": "0.60.0-microsoft.68",
"description": "[Microsoft Fork] A framework for building native apps using React",
"license": "MIT",
"repository": {
Expand Down
20 changes: 20 additions & 0 deletions packages/react-native-macos-init/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "react-native-macos-init",
"entries": [
{
"date": "Sun, 05 Apr 2020 00:06:57 GMT",
"tag": "react-native-macos-init_v2.0.0",
"version": "2.0.0",
"comments": {
"major": [
{
"comment": "Update scripts to publish react-native-macos-init",
"author": "tomun@microsoft.com",
"commit": "e9f6c209bc1ad6772a38c0ea9aca9842f058b187",
"package": "react-native-macos-init"
}
]
}
}
]
}
13 changes: 13 additions & 0 deletions packages/react-native-macos-init/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Change Log - react-native-macos-init

This log was last generated on Sun, 05 Apr 2020 00:06:57 GMT and should not be manually modified.

<!-- Start content -->

## 2.0.0

Sun, 05 Apr 2020 00:06:57 GMT

### Major changes

- Update scripts to publish react-native-macos-init (tomun@microsoft.com)
2 changes: 1 addition & 1 deletion packages/react-native-macos-init/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-macos-init",
"version": "0.0.0",
"version": "2.0.0",
"description": "CLI to add react-native-macos to an existing react-native project",
"main": "index.js",
"repository": "https://github.com/microsoft/react-native-macos",
Expand Down
4 changes: 2 additions & 2 deletions template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
},
"dependencies": {
"react": "16.8.6",
"react-native": "0.60.0"
"react-native": "0.60.0-microsoft.67"
},
"devDependencies": {
"@babel/core": "^7.3.3",
"@babel/runtime": "^7.3.1",
"@react-native-community/eslint-config": "^0.0.3",
"@react-native-community/eslint-config": "^0.0.6",
"babel-jest": "^24.1.0",
"jest": "^24.1.0",
"metro-react-native-babel-preset": "^0.54.1",
Expand Down

0 comments on commit 408dae3

Please sign in to comment.