Skip to content

Commit

Permalink
Merge pull request #195 from WildernessLabs/dominique-UpdateCI
Browse files Browse the repository at this point in the history
Update all the CI versions.
  • Loading branch information
adrianstevens authored Oct 15, 2024
2 parents 8e96b27 + 7f9e184 commit 3eaed90
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 78 deletions.
85 changes: 10 additions & 75 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: VS4Win Extension
env:
IDE_TOOLS_RELEASE_VERSION: 1.9.9
IDE_TOOLS_RELEASE_VERSION: 1.9.9.1

on:
push:
Expand All @@ -11,110 +11,45 @@ on:
workflow_dispatch:

jobs:
# build-2019:
# runs-on: windows-2019
# name: Build VS2019 Extension

# steps:
# - name: Checkout current repo
# uses: actions/checkout@v2
# with:
# path: main

# - if: ${{ github.ref == 'refs/heads/main' }}
# name: Checkout Meadow.CLI.Core side-by-side
# uses: actions/checkout@v2
# with:
# repository: WildernessLabs/Meadow.CLI
# path: Meadow.CLI
# ref: main

# - if: ${{ github.ref != 'refs/heads/main' }}
# name: Checkout Meadow.CLI.Core side-by-side
# uses: actions/checkout@v2
# with:
# repository: WildernessLabs/Meadow.CLI
# path: Meadow.CLI
# ref: develop

# - name: Setup .NET Core SDK 5.0.x and 6.0.x
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: |
# 5.0.x
# 6.0.x

# - name: Setup NuGet
# uses: NuGet/[email protected]

# - name: Add MSBuild to Path
# uses: microsoft/[email protected]

# - if: ${{ github.event_name == 'workflow_dispatch' }}
# name: Update VS2019 Version Numbers
# run: |
# $content = Get-Content main/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest | Out-String
# $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
# $newcontent | Set-Content main/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest

# - name: Restore VS2019 dependencies
# run: msbuild main/VS_Meadow_Extension.2019.sln /t:Restore /p:Configuration=Release

# - name: Build VS2019 Extension
# id: VS2019-Extension
# run: msbuild main/VS_Meadow_Extension.2019.sln /t:Rebuild /p:Configuration=Release
# env:
# DevEnvDir: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE'

# - name: Upload VSIX Artifacts
# uses: actions/upload-artifact@v2
# with:
# name: Meadow.Win.VS2019.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
# path: 'main\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\*.vsix'

# - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
# name: Publish VS2019 Extension
# run: |
# & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "main\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "main\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"

build-2022:
runs-on: windows-2022
name: Build VS2022 Extension

steps:
- name: Checkout current repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: main

- if: ${{ github.ref == 'refs/heads/main' }}
name: Checkout Meadow.CLI.Core side-by-side
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.CLI
path: Meadow.CLI
ref: main

- if: ${{ github.ref != 'refs/heads/main' }}
name: Checkout Meadow.CLI.Core side-by-side
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.CLI
path: Meadow.CLI
ref: develop

- name: Setup .NET Core SDK 5.0.x and 6.0.x
uses: actions/setup-dotnet@v1
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.5
uses: NuGet/setup-nuget@v2

- name: Add MSBuild to Path
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2
with:
vs-version: '[17.0, 18.0)'

Expand All @@ -135,7 +70,7 @@ jobs:
DevEnvDir: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE'

- name: Upload VSIX Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Meadow.Win.VS2022.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
path: 'main\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\*.vsix'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="VS_Meadow_Extension.ProjectType..fe358059-9487-4fe7-a01a-4b67b8231321" Version="1.9.9" Language="en-US" Publisher="Wilderness Labs" />
<Identity Id="VS_Meadow_Extension.ProjectType..fe358059-9487-4fe7-a01a-4b67b8231321" Version="1.9.9.1" Language="en-US" Publisher="Wilderness Labs" />
<DisplayName>VS 2019 Tools for Meadow</DisplayName>
<Description xml:space="preserve">Tools for developing Meadow applications</Description>
<Icon>wildernesslabs_icon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="VS_Meadow_Extension.2022.d5eb772d-2173-4795-b60b-67929a9bf12d" Version="1.9.9" Language="en-US" Publisher="Wilderness Labs" />
<Identity Id="VS_Meadow_Extension.2022.d5eb772d-2173-4795-b60b-67929a9bf12d" Version="1.9.9.1" Language="en-US" Publisher="Wilderness Labs" />
<DisplayName>VS 2022 Tools for Meadow</DisplayName>
<Description xml:space="preserve">Tools for developing Meadow applications</Description>
<Icon>wildernesslabs_icon.png</Icon>
Expand Down
2 changes: 1 addition & 1 deletion VS_Meadow_Extension/VS_Meadow_Extension.Shared/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Meadow
{
public static class Globals
{
public const string AssemblyVersion = "1.9.9.0";
public const string AssemblyVersion = "1.9.9.1";

public const string MeadowCapability = "Meadow";

Expand Down
4 changes: 4 additions & 0 deletions overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ For step by step instructions on using this extension, [check out the tutorial](

## Release Notes

### 1.9.9.1

- Update NoLink list

### 1.9.9

- Include ProjectLab in NoLink list
Expand Down

0 comments on commit 3eaed90

Please sign in to comment.