diff --git a/README.md b/README.md index a7a1eb045d..a510555939 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ generated packages show changes when being regenerated. You can search for known issues in the [Known Generator Issues Markdown file](docs/known_generator_issues.md). **Note:** When porting new packages between branches, you must regenerate the packages when crossing the 10.0/9.0 boundary. -This is because in 10.0 the generated projects switched from using PackageReference to PojectReference. +This is because in 10.0 the generated projects switched from using PackageReference to ProjectReference. Porting new packages across 10.0/9.0 boundary will introduce prebuilts. See the workflow documented in the servicing branch readmes for additional requirements when adding new packages pre 10.0. diff --git a/azure-pipelines/builds/ci.yml b/azure-pipelines/builds/ci.yml index aa6079105b..b98dc0d19b 100644 --- a/azure-pipelines/builds/ci.yml +++ b/azure-pipelines/builds/ci.yml @@ -25,6 +25,8 @@ extends: template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate parameters: sdl: + binskim: + enabled: true componentgovernance: # All of the SBRPs must be ignored because it is possible some of them are for vulnerable versions. # Because they are reference only packages they are not vulnerable themselves. @@ -43,8 +45,6 @@ extends: name: $(DncEngInternalBuildPool) image: 1es-ubuntu-2204 os: linux - customBuildTags: - - ES365AIMigrationTooling stages: - template: /azure-pipelines/templates/stages/build.yml@self parameters: