Skip to content

Commit 59469f5

Browse files
author
Joshua Peterson
authored
Merge pull request #15 from Unity-Technologies/bot-upstream-main-merge-2021-12-04
Sync with upstream main branch
2 parents 41c0242 + 541c8a2 commit 59469f5

File tree

7,427 files changed

+83659
-64739
lines changed

Some content is hidden

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

7,427 files changed

+83659
-64739
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.21529.1",
18+
"version": "1.0.0-prerelease.21602.2",
1919
"commands": [
2020
"xharness"
2121
]

‎.devcontainer/devcontainer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212

1313
"settings": {
1414
// Loading projects on demand is better for larger codebases
15-
"omnisharp.enableMsBuildLoadProjectsOnDemand": true
15+
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
16+
"omnisharp.enableRoslynAnalyzers": true,
17+
"omnisharp.enableEditorConfigSupport": true,
18+
"omnisharp.enableAsyncCompletion": true,
19+
"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
1620
},
1721

1822
// Add the IDs of extensions you want installed when the container is created.
@@ -23,6 +27,9 @@
2327
// Use 'onCreateCommand' to run pre-build commands inside the codespace
2428
"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh",
2529

30+
// Use 'postCreateCommand' to run commands after the container is created.
31+
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh",
32+
2633
// Add the locally installed dotnet to the path to ensure that it is activated
2734
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
2835
"remoteEnv": {

‎.devcontainer/scripts/onCreateCommand.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ set -e
44

55
# prebuild the repo, so it is ready for development
66
./build.sh libs+clr -rc Release
7+
# restore libs tests so that the project is ready to be loaded by OmniSharp
8+
./build.sh libs.tests -restore
9+
10+
# save the commit hash of the currently built assemblies, so developers know which version was built
11+
git rev-parse HEAD > ./artifacts/prebuild.sha

‎.devcontainer/scripts/postCreateCommand.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
# reset the repo to the commit hash that was used to build the prebuilt Codespace
6+
git reset --hard $(cat ./artifacts/prebuild.sha)

‎.github/ISSUE_TEMPLATE/02_api_proposal.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ body:
3333
public void Fancy(T item);
3434
}
3535
}
36-
```
36+
```
3737
validations:
3838
required: true
3939
- type: textarea
4040
id: api-usage
4141
attributes:
4242
label: API Usage
4343
description: |
44-
Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and useable.
44+
Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and usable.
4545
placeholder: API usage
4646
value: |
4747
```C#
@@ -52,7 +52,7 @@ body:
5252
// Getting the values out
5353
foreach (var v in c)
5454
Console.WriteLine(v);
55-
```
55+
```
5656
validations:
5757
required: true
5858
- type: textarea

‎.github/workflows/aspnetcore-sync-checkdiff.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Check the code is in sync
2+
$changed = (select-string "nothing to commit" artifacts\status.txt).count -eq 0
3+
return $changed

‎.github/workflows/aspnetcore-sync.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: AspNetCore->Runtime Code Sync
2+
on:
3+
# Manual run
4+
workflow_dispatch:
5+
6+
permissions:
7+
contents: write
8+
issues: write
9+
pull-requests: write
10+
11+
jobs:
12+
compare_repos:
13+
# Comment out this line to test the scripts in a fork
14+
if: github.repository == 'dotnet/runtime'
15+
name: Sync Code
16+
runs-on: windows-latest
17+
steps:
18+
- name: Checkout aspnetcore
19+
uses: actions/[email protected]
20+
with:
21+
# Test this script using changes in a fork
22+
repository: 'dotnet/aspnetcore'
23+
path: aspnetcore
24+
ref: main
25+
- name: Checkout runtime
26+
uses: actions/[email protected]
27+
with:
28+
# Test this script using changes in a fork
29+
repository: 'dotnet/runtime'
30+
path: runtime
31+
ref: main
32+
- name: Copy
33+
shell: cmd
34+
working-directory: .\aspnetcore\src\Shared\runtime\
35+
env:
36+
RUNTIME_REPO: d:\a\runtime\runtime\runtime\
37+
run: CopyToRuntime.cmd
38+
- name: Diff
39+
shell: cmd
40+
working-directory: .\runtime\
41+
run: |
42+
mkdir ..\artifacts
43+
git status > ..\artifacts\status.txt
44+
git diff > ..\artifacts\diff.txt
45+
- uses: actions/upload-artifact@v1
46+
with:
47+
name: results
48+
path: artifacts
49+
- name: Check
50+
id: check
51+
shell: pwsh
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
run: |
55+
$changed = .\runtime\.github\workflows\aspnetcore-sync-checkdiff.ps1
56+
echo "::set-output name=changed::$changed"
57+
- name: Send PR
58+
if: steps.check.outputs.changed == 'true'
59+
# https://github.com/marketplace/actions/create-pull-request
60+
uses: dotnet/actions-create-pull-request@v3
61+
with:
62+
token: ${{ secrets.GITHUB_TOKEN }}
63+
path: .\runtime
64+
commit-message: 'Sync shared code from aspnetcore'
65+
title: 'Sync shared code from aspnetcore'
66+
body: 'This PR was automatically generated to sync shared code changes from aspnetcore. Fixes https://github.com/dotnet/aspnetcore/issues/18943'
67+
labels: area-System.Net.Http
68+
base: main
69+
branch: github-action/sync-aspnetcore
70+
branch-suffix: timestamp

‎.github/workflows/backport.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ on:
33
issue_comment:
44
types: [created]
55

6+
permissions:
7+
contents: write
8+
issues: write
9+
pull-requests: write
10+
611
jobs:
712
backport:
813
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to')

‎.github/workflows/create-codespaces-prebuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
workflow_dispatch:
77
jobs:
88
createPrebuild:
9+
# Only run in the main repository since it will fail in forks
10+
if: github.repository == 'dotnet/runtime'
11+
permissions:
12+
contents: write
913
runs-on: ubuntu-latest
1014
steps:
1115
- uses: actions/checkout@v2

‎.github/workflows/markdownlint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Markdownlint
22

3+
permissions:
4+
contents: read
5+
36
on:
47
pull_request:
58
paths:

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ node_modules/
186186
*.metaproj
187187
*.metaproj.tmp
188188
bin.localpkg/
189+
src/mono/wasm/runtime/dotnet.d.ts.sha256
189190

190191
# RIA/Silverlight projects
191192
Generated_Code/
@@ -354,3 +355,7 @@ src/coreclr/System.Private.CoreLib/common
354355
!src/coreclr/inc/obj/
355356
!src/coreclr/vm/.vscode/
356357
!src/coreclr/vm/.vscode/c_cpp_properties.json
358+
359+
# Temporary artifacts from local libraries stress builds
360+
.dotnet-daily/
361+
run-stress-*

‎Directory.Build.props

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,11 @@
266266
<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
267267
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
268268
<IsPrerelease>true</IsPrerelease>
269-
<IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
270269
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
271-
<!-- Experimental packages should not be stable -->
272-
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
273-
<IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
270+
<!-- Private packages should not be stable -->
271+
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
274272
<!-- We don't want Private packages to be shipped to NuGet.org -->
275-
<IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
273+
<IsShippingPackage Condition="$(IsPrivateAssembly)">false</IsShippingPackage>
276274
<PlaceholderFile>$(RepositoryEngineeringDir)_._</PlaceholderFile>
277275
</PropertyGroup>
278276

@@ -295,9 +293,6 @@
295293
<AppDesignerFolder>Properties</AppDesignerFolder>
296294
<!-- By default the SDK produces ref assembly for 5.0 or later -->
297295
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
298-
<!-- We have very special projects that don't always contain default references. We also build MSBuild Tasks
299-
and there are some implicit namespaces that clash, i.e System.Threading.Tasks. -->
300-
<DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet>
301296
</PropertyGroup>
302297

303298
<PropertyGroup>

0 commit comments

Comments
 (0)