Skip to content

Commit 9a08aad

Browse files
author
Joshua Peterson
authored
Merge pull request #25 from Unity-Technologies/bot-upstream-main-merge-2021-12-15
Sync with upstream main branch
2 parents 17d9617 + cea9003 commit 9a08aad

File tree

6,233 files changed

+369853
-27705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,233 files changed

+369853
-27705
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.21602.2",
18+
"version": "1.0.0-prerelease.21613.2",
1919
"commands": [
2020
"xharness"
2121
]

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trim_trailing_whitespace = true
1616
indent_size = 2
1717

1818
# Generated code
19-
[*{_AssemblyInfo.cs,.notsupported.cs}]
19+
[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
2020
generated_code = true
2121

2222
# C# files

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,4 @@ src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-
7575
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-input25000.txt text eol=lf
7676
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input.txt text eol=lf
7777
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input-big.txt text eol=lf
78+
src/mono/wasm/runtime/dotnet.d.ts text eol=lf

0 commit comments

Comments
 (0)