diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 01d9429d0..24eed83a4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23074.3", + "version": "1.1.0-beta.23077.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f231d5be6..82367408d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 3900335a25247d931fc62a62a1ebc30acbb5403d - + https://github.com/dotnet/arcade-services - 7f00b18a4e98088f201fc2baf8a7a16f3371f88f + a018eaa016d2132265bfafdcb58d8cb35da6d567 - + https://github.com/dotnet/arcade-services - 7f00b18a4e98088f201fc2baf8a7a16f3371f88f + a018eaa016d2132265bfafdcb58d8cb35da6d567 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c32a309c0..1128352a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.23074.3 + 1.1.0-beta.23077.3 diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 16dcb2113..99a34658f 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -36,6 +36,7 @@ stages: ./.dotnet/dotnet darc vmr scan-binary-files --vmr "$(Build.SourcesDirectory)" --tmp "$(Agent.TempDirectory)" + --baseline-file "src/VirtualMonoRepo/allowed-binaries.txt" || (echo '##[error]Found binaries in the VMR' && exit 1) displayName: Scan for binaries workingDirectory: $(Build.SourcesDirectory)/src/installer diff --git a/src/VirtualMonoRepo/allowed-binaries.txt b/src/VirtualMonoRepo/allowed-binaries.txt new file mode 100644 index 000000000..df03dde55 --- /dev/null +++ b/src/VirtualMonoRepo/allowed-binaries.txt @@ -0,0 +1,55 @@ +*.bmp +*.docx +*.gif +*.ico +*.jpg +*.JPG +*.pdf +*.png +*.PNG +*.rtf +*.snk +*.vsd +*.vsdx +*.xlsx + +**/test/* +**/Test/* +**/Test/* +**/testCert*.pfx +**/TestCert*.pfx +**/tests/* + +src/arcade/src/Microsoft.DotNet.SignTool.Tests/* + +src/aspnetcore/**/samples/* +src/aspnetcore/**/TestCertificates/* +src/aspnetcore/src/*.eot +src/aspnetcore/src/*.otf +src/aspnetcore/src/*.ttf +src/aspnetcore/src/*.woff +src/aspnetcore/src/*.woff2 +src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.server.js # JavaScript file with a null byte +src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.webview.js # JavaScript file with a null byte +src/aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/**/app.db +src/aspnetcore/src/submodules/spa-templates/**/app.db + +src/fsharp/**/signedtests/* +src/fsharp/src/fsi/fsi.res # Icon + +src/msbuild/src/Tasks.UnitTests/* + +src/razor/**/SampleApp/**/fonts/* + +src/roslyn/**/CodeAnalysisTest/* + +src/runtime/src/libraries/System.Diagnostics.EventLog/src/Messages/EventLogMessages.res # Icon +src/runtime/src/mono/wasm/testassets/* +src/runtime/src/native/external/brotli/common/dictionary.bin.br + +src/sdk/src/Assets/TestProjects/* + +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/build/strongNameBypass.reg # UTF16-LE text file +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/build/strongNameBypass2.reg # UTF16-LE text file +src/source-build-externals/src/humanizer/src/Humanizer.Tests* +src/source-build-externals/src/newtonsoft-json/Src/Newtonsoft.Json.Tests/SpaceShipV2.bson