Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix1574
Browse files Browse the repository at this point in the history
  • Loading branch information
AArnott committed Mar 14, 2023
2 parents 0e387c5 + 1d322ca commit 641c87d
Show file tree
Hide file tree
Showing 294 changed files with 6,398 additions and 6,042 deletions.
14 changes: 14 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
#RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
#RUN echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | tee /etc/apt/sources.list.d/mono-official-stable.list
#RUN apt-get update
#RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mono-devel

# Clear the NUGET_XMLDOC_MODE env var so xml api doc files get unpacked, allowing a rich experience in Intellisense.
# See https://github.com/dotnet/dotnet-docker/issues/2790 for a discussion on this, where the prioritized use case
# was *not* devcontainers, sadly.
ENV NUGET_XMLDOC_MODE=
20 changes: 20 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "Dev space",
"dockerFile": "Dockerfile",
"settings": {
"terminal.integrated.shell.linux": "/usr/bin/pwsh"
},
"postCreateCommand": "./init.ps1 -InstallLocality machine",
"extensions": [
"ms-azure-devops.azure-pipelines",
"ms-dotnettools.csharp",
"k--kato.docomment",
"editorconfig.editorconfig",
"pflannery.vscode-versionlens",
"davidanson.vscode-markdownlint",
"dotjoshjohnson.xml",
"ms-vscode-remote.remote-containers",
"ms-azuretools.vscode-docker",
"ms-vscode.powershell"
]
}
81 changes: 75 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# EditorConfig is awesome:http://EditorConfig.org
# EditorConfig is awesome:http://EditorConfig.org

# top-most EditorConfig file
root = true

# Don't use tabs for indentation.
[*]
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

# (Please don't specify an indent_size here; that has too many unintended consequences.)

Expand All @@ -18,18 +16,21 @@ indent_style = space
# Code files
[*.{cs,csx,vb,vbx,h,cpp,idl}]
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
# MSBuild project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,msbuildproj,props,targets}]
indent_size = 2

# Xml config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
[*.{ruleset,config,nuspec,resx,vsixmanifest,vsct,runsettings}]
indent_size = 2

# JSON files
[*.json]
indent_size = 2
indent_style = space

# Dotnet code style settings:
[*.{cs,vb}]
Expand Down Expand Up @@ -167,3 +168,71 @@ csharp_new_line_before_members_in_anonymous_types = true

# Blocks are allowed
csharp_prefer_braces = true:silent

dotnet_diagnostic.RS0041.severity = suggestion

# SA1130: Use lambda syntax
dotnet_diagnostic.SA1130.severity = silent

# IDE1006: Naming Styles - StyleCop handles these for us
dotnet_diagnostic.IDE1006.severity = none

dotnet_diagnostic.DOC100.severity = silent
dotnet_diagnostic.DOC104.severity = warning
dotnet_diagnostic.DOC105.severity = warning
dotnet_diagnostic.DOC106.severity = warning
dotnet_diagnostic.DOC107.severity = warning
dotnet_diagnostic.DOC108.severity = warning
dotnet_diagnostic.DOC200.severity = warning
dotnet_diagnostic.DOC202.severity = warning

# CS1591: Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = suggestion

# SA1101: Prefix local calls with this
dotnet_diagnostic.SA1101.severity = suggestion

# SA120x: Element ordering
dotnet_diagnostic.SA1201.severity = silent
dotnet_diagnostic.SA1202.severity = silent
dotnet_diagnostic.SA1204.severity = silent
dotnet_diagnostic.SA1214.severity = silent

# SA1121: Use built-in type alias
dotnet_diagnostic.SA1121.severity = suggestion

# SA1124: Do not use regions
dotnet_diagnostic.SA1124.severity = suggestion

# SA1133: Each attribute should be placed in its own set of square brackets
dotnet_diagnostic.SA1133.severity = silent

# SA1134: Each attribute should be placed on its own line of code
dotnet_diagnostic.SA1134.severity = silent

# SA1139: Use literal syntax instead of casting
dotnet_diagnostic.SA1139.severity = suggestion

# SA1600: Elements should be documented
dotnet_diagnostic.SA1600.severity = silent

# SA1601: Partial elements should be documented
dotnet_diagnostic.SA1601.severity = silent

# SA1602: Enumeration items should be documented
dotnet_diagnostic.SA1602.severity = silent

# SA1601: Element documentation should have summary
dotnet_diagnostic.SA1604.severity = suggestion

# SA1615: The documentation for parameter is missing
dotnet_diagnostic.SA1611.severity = suggestion

# SA1615: Element return value should be documented
dotnet_diagnostic.SA1615.severity = suggestion

# SA1618: Document type parameters
dotnet_diagnostic.SA1618.severity = suggestion

[*.sln]
indent_style = tab
15 changes: 10 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
*.sh text eol=lf

# Ensure shell scripts use LF line endings (linux only accepts LF)
*.sh eol=lf
*.ps1 eol=lf

# The macOS codesign tool is extremely picky, and requires LF line endings.
*.plist eol=lf

###############################################################################
# Set default behavior for command prompt diff.
Expand All @@ -18,7 +24,7 @@
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
Expand Down Expand Up @@ -47,9 +53,9 @@

###############################################################################
# diff behavior for common document formats
#
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
Expand All @@ -62,4 +68,3 @@
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: nuget
directory: /
schedule:
interval: monthly
48 changes: 48 additions & 0 deletions .github/workflows/unity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: unity

on:
workflow_dispatch:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

jobs:
unity:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- uses: actions/setup-dotnet@v3
with:
global-json-file: global.json
- name: copy assets
run: src/MessagePack.UnityClient/copy_assets.sh
- uses: actions/cache@v3
with:
path: src/MessagePack.UnityClient/Library
key: MessagePack-ubuntu
- name: build
uses: game-ci/unity-builder@v2
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE_2021 }}
with:
projectPath: src/MessagePack.UnityClient
unityVersion: 2021.3.11f1
targetPlatform: StandaloneLinux64
buildMethod: PackageExporter.Export
customParameters: /headless /ScriptBackend mono
versioning: None
- uses: Cysharp/Actions/.github/actions/check-metas@main # check meta files
with:
directory: src/MessagePack.UnityClient
- uses: actions/upload-artifact@v3
with:
name: MessagePack.unitypackage
path: bin/*.unitypackage
Loading

0 comments on commit 641c87d

Please sign in to comment.