Skip to content

Commit

Permalink
Bump version to 1.1.1.0 and comment out VS2019 releases.
Browse files Browse the repository at this point in the history
  • Loading branch information
CartBlanche committed Jul 18, 2023
1 parent c03ff6e commit 7da36e0
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 52 deletions.
94 changes: 47 additions & 47 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Meadow.CLI
env:
TOOLS_RELEASE_VERSION: 1.1.0.0
SHORT_TOOLS_RELEASE_VERSION: 1.1.0
TOOLS_RELEASE_VERSION: 1.1.1.0
SHORT_TOOLS_RELEASE_VERSION: 1.1.1
MEADOW_OS_VERSION: 1.1.0.0
VS_MAC_2019_VERSION: 8.10
VS_MAC_2022_VERSION: 17.5
Expand Down Expand Up @@ -142,10 +142,10 @@ jobs:
name: Meadow.Win.VS2019.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
path: 'vs-win\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 "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "vs-win\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"
#- 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 "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "vs-win\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"

build-vswin-2022:
runs-on: windows-2022
Expand Down Expand Up @@ -282,47 +282,47 @@ jobs:
name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack'

- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
name: Get Commit Messages
id: commit_messages
uses: actions/github-script@v6
with:
github-token: ${{ secrets.MEADOW_MAC_TOKEN }}
script: |
const { owner, repo } = context.repo;
const latestRelease = await github.rest.repos.getLatestRelease({
owner: 'WildernessLabs',
repo: 'VS_Mac_Meadow_Extension',
});
const commits = await github.rest.repos.listCommits({
owner: 'WildernessLabs',
repo: 'VS_Mac_Meadow_Extension',
since: latestRelease.created_at
});
const messages = commits.data.map(commit => `* ${commit.commit.message}`).join(' \n');
const formattedMessages = `## What's Changed \n${messages}`;
return formattedMessages;
- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
name: Create VS2019 Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.MEADOW_MAC_TOKEN }}
with:
owner: WildernessLabs
repo: VS_Mac_Meadow_Extension
tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }}
release_name: VS Mac VS2019 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
body: |
${{ steps.commit_messages.outputs.result }}
draft: true
prerelease: false
commitish: main
#- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
# name: Get Commit Messages
# id: commit_messages
# uses: actions/github-script@v6
# with:
# github-token: ${{ secrets.MEADOW_MAC_TOKEN }}
# script: |
# const { owner, repo } = context.repo;

# const latestRelease = await github.rest.repos.getLatestRelease({
# owner: 'WildernessLabs',
# repo: 'VS_Mac_Meadow_Extension',
# });

# const commits = await github.rest.repos.listCommits({
# owner: 'WildernessLabs',
# repo: 'VS_Mac_Meadow_Extension',
# since: latestRelease.created_at
# });

# const messages = commits.data.map(commit => `* ${commit.commit.message}`).join(' \n');
# const formattedMessages = `## What's Changed \n${messages}`;

# return formattedMessages;

#- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
# name: Create VS2019 Release
# id: create_release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.MEADOW_MAC_TOKEN }}
# with:
# owner: WildernessLabs
# repo: VS_Mac_Meadow_Extension
# tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }}
# release_name: VS Mac VS2019 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
# body: |
# ${{ steps.commit_messages.outputs.result }}
# draft: true
# prerelease: false
# commitish: main

# - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
#- name: Upload Release Asset
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Meadow.CLI.Core
{
public static class Constants
{
public const string CLI_VERSION = "1.1.0.0";
public const string CLI_VERSION = "1.1.1.0";
public const ushort HCOM_PROTOCOL_PREVIOUS_VERSION_NUMBER = 0x0006;
public const ushort HCOM_PROTOCOL_CURRENT_VERSION_NUMBER = 0x0007; // Used for transmission
public const string WILDERNESS_LABS_USB_VID = "2E6A";
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.1.0.0</Version>
<Version>1.1.1.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.1.0.0</Version>
<Version>1.1.1.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.1.0.0</Version>
<Version>1.1.1.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI/Meadow.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis</Authors>
<Company>Wilderness Labs, Inc</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>1.1.0.0</PackageVersion>
<PackageVersion>1.1.1.0</PackageVersion>
<Platforms>AnyCPU</Platforms>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
<PackageIcon>icon.png</PackageIcon>
Expand Down
3 changes: 3 additions & 0 deletions Meadow.Tools.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
},
{
"path": "../VSCode_Meadow_Extension"
},
{
"path": "../Meadow.Sdk"
}
],
}

0 comments on commit 7da36e0

Please sign in to comment.