-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from mcneel/curtis/vs-mac-2022-support
Add VS for Mac 2022 support
- Loading branch information
Showing
66 changed files
with
991 additions
and
1,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "omnisharp.defaultLaunchSolution": "Rhino.VisualStudio.Mac.sln", | ||
| "var": { | ||
| "configuration" : "Debug", | ||
| "buildProperties" : "/v:Minimal /p:GenerateFullPaths=True /consoleLoggerParameters:NoSummary" | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,135 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "build-mac", | ||
| "type": "shell", | ||
| "command": "msbuild", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:Configuration=${input:configuration}", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Mac/Rhino.VisualStudio.Mac.csproj" | ||
| ], | ||
| "group": "build", | ||
| "presentation": { | ||
| "clear": true | ||
| }, | ||
| "problemMatcher": "$msCompile" | ||
| }, | ||
| { | ||
| "label": "build-windows-2019", | ||
| "type": "shell", | ||
| "command": "${input:msbuild2019}", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:Configuration=${input:configuration}", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Windows.2019/Rhino.VisualStudio.Windows.2019.csproj" | ||
| ], | ||
| "group": "build", | ||
| "presentation": { | ||
| "clear": true | ||
| }, | ||
| "problemMatcher": "$msCompile" | ||
| }, | ||
| { | ||
| "label": "build-windows-2022", | ||
| "type": "shell", | ||
| "command": "${input:msbuild2022}", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:Configuration=${input:configuration}", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Windows.2022/Rhino.VisualStudio.Windows.2022.csproj" | ||
| ], | ||
| "group": "build", | ||
| "presentation": { | ||
| "clear": true | ||
| }, | ||
| "problemMatcher": "$msCompile" | ||
| }, | ||
| { | ||
| "label": "build-templates", | ||
| "type": "shell", | ||
| "command": "dotnet", | ||
| "args": [ | ||
| "build", | ||
| "/p:Configuration=${input:configuration}", | ||
| "/p:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary", | ||
| "${workspaceFolder}/Rhino.Templates/Rhino.Templates.csproj" | ||
| ], | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "generate-templates", | ||
| "type": "shell", | ||
| "dependsOn": "build-templates", | ||
| "command": "dotnet build ${workspaceFolder}/build/GenerateTemplates.proj", | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "build-all", | ||
| "dependsOn": [ | ||
| "build-templates", | ||
| "build-windows-2019", | ||
| "build-windows-2022" | ||
| ], | ||
| "dependsOrder": "sequence", | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| } | ||
| ], | ||
| "inputs": [ | ||
| { | ||
| "id": "msbuild2019", | ||
| "type": "command", | ||
| "command": "shellCommand.execute", | ||
| "args": { | ||
| "command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[16,17)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe", | ||
| "useFirstResult": "true" | ||
| } | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "build-2019", | ||
| "type": "shell", | ||
| "osx": { | ||
| "command": "msbuild", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:VSVersion=2019", | ||
| "/bl:${workspaceFolder}/artifacts/log/Rhino.VisualStudio.Mac.2019.binlog", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Mac/Rhino.VisualStudio.Mac.csproj", | ||
| ], | ||
| }, | ||
| "windows": { | ||
| "command": "${input:msbuild2019}", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:VSVersion=2019", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Windows/Rhino.VisualStudio.Windows.csproj", | ||
| ], | ||
| }, | ||
| "args": [], | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "reveal": "always", | ||
| "clear": true | ||
| }, | ||
| { | ||
| "id": "msbuild2022", | ||
| "type": "command", | ||
| "command": "shellCommand.execute", | ||
| "args": { | ||
| "command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[17,18)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe", | ||
| "useFirstResult": "true" | ||
| } | ||
| "group": "build" | ||
| }, | ||
| { | ||
| "label": "build-2022", | ||
| "type": "shell", | ||
| "osx": { | ||
| "command": "dotnet", | ||
| "args": [ | ||
| "build", | ||
| "/p:VSVersion=2022", | ||
| "/bl:${workspaceFolder}/artifacts/log/Rhino.VisualStudio.Mac.2022.binlog", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Mac/Rhino.VisualStudio.Mac.csproj", | ||
| ], | ||
| }, | ||
| { | ||
| "type": "pickString", | ||
| "id": "configuration", | ||
| "description": "Build Configuration (press escape to continue without building)", | ||
| "options": [ | ||
| "Debug", | ||
| "Release" | ||
| "windows": { | ||
| "command": "${input:msbuild2022}", | ||
| "args": [ | ||
| "/restore", | ||
| "/v:Minimal", | ||
| "/p:VSVersion=2022", | ||
| "${workspaceFolder}/Rhino.VisualStudio.Windows/Rhino.VisualStudio.Windows.csproj", | ||
| ], | ||
| "default": "Debug" | ||
| }, | ||
| "args": [], | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "reveal": "always", | ||
| "clear": true | ||
| }, | ||
| "group": "build" | ||
| }, | ||
| { | ||
| "label": "build-templates", | ||
| "type": "shell", | ||
| "command": "dotnet", | ||
| "args": [ | ||
| "build", | ||
| "/p:Configuration=${input:configuration}", | ||
| "/p:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary", | ||
| "${workspaceFolder}/Rhino.Templates/Rhino.Templates.csproj" | ||
| ], | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "generate-templates", | ||
| "type": "shell", | ||
| "dependsOn": "build-templates", | ||
| "command": "dotnet build ${workspaceFolder}/build/GenerateTemplates.proj", | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "build-all", | ||
| "dependsOn": [ | ||
| "build-templates", | ||
| "build-2019", | ||
| "build-2022" | ||
| ], | ||
| "dependsOrder": "sequence", | ||
| "problemMatcher": "$msCompile", | ||
| "presentation": { | ||
| "clear": true | ||
| } | ||
| } | ||
| ], | ||
| "inputs": [ | ||
| { | ||
| "id": "msbuild2019", | ||
| "type": "command", | ||
| "command": "shellCommand.execute", | ||
| "args": { | ||
| "command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[16,17)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe", | ||
| "useFirstResult": "true" | ||
| } | ||
| }, | ||
| { | ||
| "id": "msbuild2022", | ||
| "type": "command", | ||
| "command": "shellCommand.execute", | ||
| "args": { | ||
| "command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[17,18)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe", | ||
| "useFirstResult": "true" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "pickString", | ||
| "id": "configuration", | ||
| "description": "Build Configuration (press escape to continue without building)", | ||
| "options": [ | ||
| "Debug", | ||
| "Release" | ||
| ], | ||
| "default": "Debug" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <VSVersion Condition="$(VSVersion) == ''">2022</VSVersion> | ||
|
|
||
| <BasePath>$(MSBuildThisFileDirectory)</BasePath> | ||
| <BaseOutputPath>$(BasePath)artifacts\bin\$(MSBuildProjectName)\</BaseOutputPath> | ||
| <BaseIntermediateOutputPath>$(BasePath)artifacts\obj\$(OS)\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | ||
| <ArtifactsDir>$(BasePath)artifacts\</ArtifactsDir> | ||
| <BaseOutputPath>$(ArtifactsDir)bin\$(MSBuildProjectName)\</BaseOutputPath> | ||
| <BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(OS)\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | ||
|
|
||
| <Version>7.13.0</Version> <!-- PSST. Hey Curtis. Update Rhino.VisualStudio.Windows\source.extension.vsixmanifest too --> | ||
| <Version>7.21.0</Version> <!-- PSST. Hey Curtis. Update Rhino.VisualStudio.Windows\source.extension.vsixmanifest too --> | ||
| <PackageVersion>$(Version)</PackageVersion> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.