Skip to content

Commit

Permalink
[0.71] Fix Secure Supply Chain compilance issues (#12012)
Browse files Browse the repository at this point in the history
This PR backports PRs #11548 and #11855 to 0.71.

# Fix Secure Supply Chain compliance issues (#11548)

## Description

Resolves Secure Supply Chain warnings.

### Type of Change
- Bug fix (non-breaking change which fixes an issue)

### Why

To meet compliance requirements.

Closes #11209
Closes #10374

### What

* Removed invalid `nuget.config` configurations
* Removed unnecessary `.npmrc` files
* Temporarily left nuget.org feed in config (tracking: #11557)

## Screenshots
N/A

## Testing
N/A

# CG: Move to single nuget source (#11855)

## Description
CG is failing builds due to multiple nuget feeds in nuget.config.

### Why
What is the motivation for this change? Add a few sentences describing the context and overall goals of the pull request's commits.

Resolves #11557
  • Loading branch information
jonthysell committed Aug 14, 2023
1 parent fbca599 commit dec944c
Show file tree
Hide file tree
Showing 20 changed files with 39 additions and 191 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ node_modules
# Optional REPL history
.node_repl_history

# No NPM config to pass CFS compliance
.npmrc

# We use yarn, not npm
package-lock.json

#React Native
*AppPackages*
*BundleArtifacts*
Expand Down
6 changes: 5 additions & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<!-- Note: Do not specify any NuGet feeds in this file, everything is available on the fallback NuGet.org. -->
<packageSources>
<clear />
<!-- Warning: Do not add/change the NuGet feeds here. To be compliant this repo must only rely on this single ADO feed. -->
<add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" />
</packageSources>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "[0.71] Fix Secure Supply Chain compliance issues",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "[0.71] update nuget lock files",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
1 change: 0 additions & 1 deletion packages/e2e-test-app/.npmrc

This file was deleted.

6 changes: 0 additions & 6 deletions packages/e2e-test-app/windows/NuGet.Config

This file was deleted.

6 changes: 0 additions & 6 deletions packages/integration-test-app/windows/NuGet.Config

This file was deleted.

1 change: 0 additions & 1 deletion packages/sample-apps/.npmrc

This file was deleted.

6 changes: 0 additions & 6 deletions packages/sample-apps/windows/NuGet.Config

This file was deleted.

1 change: 0 additions & 1 deletion vnext/.npmrc

This file was deleted.

8 changes: 0 additions & 8 deletions vnext/Desktop.ABITests/NuGet.Config

This file was deleted.

7 changes: 0 additions & 7 deletions vnext/Desktop.DLL/NuGet.Config

This file was deleted.

8 changes: 0 additions & 8 deletions vnext/Desktop.IntegrationTests/NuGet.Config

This file was deleted.

8 changes: 0 additions & 8 deletions vnext/Desktop.UnitTests/NuGet.Config

This file was deleted.

8 changes: 0 additions & 8 deletions vnext/Desktop/NuGet.Config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"boost": {
"type": "Transitive",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.15",
"contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
},
"Microsoft.Net.Native.Compiler": {
"type": "Transitive",
"resolved": "2.2.7-rel-27913-00",
Expand All @@ -84,7 +74,7 @@
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
Expand All @@ -94,7 +84,7 @@
"NETStandard.Library": {
"type": "Transitive",
"resolved": "2.0.3",
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
Expand Down Expand Up @@ -294,7 +284,6 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
}
},
Expand All @@ -303,11 +292,7 @@
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.15, )",
"Microsoft.UI.Xaml": "[2.8.0, )",
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
"ReactCommon": "[1.0.0, )",
"boost": "[1.76.0, )"
"ReactCommon": "[1.0.0, )"
}
},
"microsoft.reactnative.managed": {
Expand All @@ -320,8 +305,7 @@
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"Folly": "[1.0.0, )"
}
}
},
Expand Down Expand Up @@ -1806,4 +1790,4 @@
}
}
}
}
}
26 changes: 5 additions & 21 deletions vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"boost": {
"type": "Transitive",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.15",
"contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
},
"Microsoft.Net.Native.Compiler": {
"type": "Transitive",
"resolved": "2.2.7-rel-27913-00",
Expand All @@ -84,7 +74,7 @@
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
Expand All @@ -94,7 +84,7 @@
"NETStandard.Library": {
"type": "Transitive",
"resolved": "2.0.3",
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
Expand Down Expand Up @@ -294,7 +284,6 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
}
},
Expand All @@ -303,11 +292,7 @@
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.15, )",
"Microsoft.UI.Xaml": "[2.8.0, )",
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
"ReactCommon": "[1.0.0, )",
"boost": "[1.76.0, )"
"ReactCommon": "[1.0.0, )"
}
},
"microsoft.reactnative.managed": {
Expand All @@ -320,8 +305,7 @@
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"Folly": "[1.0.0, )"
}
}
},
Expand Down Expand Up @@ -1806,4 +1790,4 @@
}
}
}
}
}

0 comments on commit dec944c

Please sign in to comment.