Merge branch 'v1.8'

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+launchSettings.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

MessagePack.sln

@@ -61,6 +61,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePack.AspNetCoreMvcFo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePack.Annotations", "src\MessagePack.Annotations\MessagePack.Annotations.csproj", "{85763F30-7733-44AB-89AB-D1B64F6E0D93}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5BAF9120-1293-449E-975C-A373E9DE7F69}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

azure-pipelines/build.yml

@@ -11,7 +11,7 @@ steps:
     dotnet tool install --tool-path . nbgv
     .\nbgv cloud -p src
   displayName: Set build number
-  condition: ne(variables['system.pullrequest.isfork'], true)
+
 - task: PowerShell@2
   displayName: Set VSTS variables
   inputs:
@@ -89,7 +89,7 @@ steps:
     ArtifactName: projectAssetsJson
     ArtifactType: Container
   displayName: Publish projectAssetsJson artifacts
-  condition: and(succeededOrFailed(), ne(variables['system.pullrequest.isfork'], true))
+  condition: succeededOrFailed()
 
 - task: PublishBuildArtifacts@1
   inputs:
@@ -97,7 +97,7 @@ steps:
     ArtifactName: build_logs
     ArtifactType: Container
   displayName: Publish build_logs artifacts
-  condition: and(succeededOrFailed(), ne(variables['system.pullrequest.isfork'], true))
+  condition: succeededOrFailed()
 
 ## The rest of these steps are for deployment and skipped for PR builds
 
@@ -106,7 +106,7 @@ steps:
 #    PathtoPublish: $(build.sourcesdirectory)/bin
 #    ArtifactName: bin
 #    ArtifactType: Container
-#  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['system.pullrequest.isfork'], true))
+#  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
 - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
   - template: azure-pipeline.microbuild.after.yml
@@ -126,4 +126,4 @@ steps:
     ArtifactName: deployables
     ArtifactType: Container
   displayName: Publish deployables artifacts
-  condition: and(succeededOrFailed(), ne(variables['system.pullrequest.isfork'], true))
+  condition: succeededOrFailed()

sandbox/Sandbox/README.md

@@ -0,0 +1,9 @@
+# Updating Generated.cs
+
+Generated.cs is a generated file and should not be edited manually.
+To update Generated.cs, follow these steps:
+
+	dotnet build src\MessagePack -f netstandard1.6
+	dotnet run -p src\MessagePack.UniversalCodeGenerator -- -i sandbox\SharedData\SharedData.csproj -o sandbox\sandbox\Generated.cs
+
+The first step is because `sandbox\SharedProject` references it and MPC doesn't build project references during code gen.