Skip to content

Commit 5e32d7d

Browse files
authored
Merge the 1.0.0-preview.8 release branch back to main (#418)
- Increment the versions for AIShell application and the AIShell module. - Update the package and release pipeline to allow disabling the network isolation. We need to download the tool for building MSIX and MSIXBundle packages, which won't work with the newly enforced network isolation. - The `azure` agent is now broken, likely due to changes from the Azure Copilot service side. This agent is removed from the 1.0.0-preview.8 release.
2 parents d028825 + 04a16c2 commit 5e32d7d

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

.github/workflows/dotnet.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup .NET
2121
uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 8.0.413
23+
dotnet-version: 8.0.414
2424
- name: Build
2525
shell: pwsh
2626
run: |
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup .NET
3838
uses: actions/setup-dotnet@v4
3939
with:
40-
dotnet-version: 8.0.413
40+
dotnet-version: 8.0.414
4141
- name: Build
4242
shell: pwsh
4343
run: |
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup .NET
5555
uses: actions/setup-dotnet@v4
5656
with:
57-
dotnet-version: 8.0.413
57+
dotnet-version: 8.0.414
5858
- name: Build
5959
shell: pwsh
6060
run: |

.pipelines/Package-Official.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ parameters: # parameters are shown up in ADO UI in a build queue time
55
displayName: 'Enable debug output'
66
type: boolean
77
default: false
8+
- name: disableNetworkIsolation
9+
type: boolean
10+
default: false
811

912
variables:
1013
- name: CDP_DEFINITION_BUILD_COUNT
@@ -25,6 +28,8 @@ variables:
2528
value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
2629
- name: branchCounter
2730
value: $[counter(variables['branchCounterKey'], 1)]
31+
- name: disableNetworkIsolation
32+
value: ${{ parameters.disableNetworkIsolation }}
2833

2934
resources:
3035
pipelines:
@@ -53,6 +58,7 @@ extends:
5358
WindowsHostVersion:
5459
Version: 2022
5560
Network: KS3
61+
disableNetworkIsolation: ${{ variables.disableNetworkIsolation }}
5662
globalSdl:
5763
disableLegacyManifest: true
5864
# disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.

.pipelines/Release-Official.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ parameters: # parameters are shown up in ADO UI in a build queue time
99
displayName: 'Publish artifacts'
1010
type: boolean
1111
default: true
12+
- name: disableNetworkIsolation
13+
type: boolean
14+
default: false
1215

1316
variables:
1417
- name: CDP_DEFINITION_BUILD_COUNT
@@ -21,6 +24,8 @@ variables:
2124
value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
2225
- name: LinuxContainerImage
2326
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
27+
- name: disableNetworkIsolation
28+
value: ${{ parameters.disableNetworkIsolation }}
2429

2530
resources:
2631
repositories:
@@ -50,6 +55,7 @@ extends:
5055
WindowsHostVersion:
5156
Version: 2022
5257
Network: KS3
58+
disableNetworkIsolation: ${{ variables.disableNetworkIsolation }}
5359
globalSdl:
5460
asyncSdl:
5561
enabled: true

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.413"
3+
"version": "8.0.414"
44
}
55
}

shell/AIShell.Integration/AIShell.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@{
22
RootModule = 'AIShell.psm1'
33
NestedModules = @("AIShell.Integration.dll")
4-
ModuleVersion = '1.0.7'
4+
ModuleVersion = '1.0.8'
55
GUID = 'ECB8BEE0-59B9-4DAE-9D7B-A990B480279A'
66
Author = 'Microsoft Corporation'
77
CompanyName = 'Microsoft Corporation'
@@ -14,5 +14,5 @@
1414
VariablesToExport = '*'
1515
AliasesToExport = @('aish', 'askai', 'fixit', 'airun')
1616
HelpInfoURI = 'https://aka.ms/aishell-help'
17-
PrivateData = @{ PSData = @{ Prerelease = 'preview7'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
17+
PrivateData = @{ PSData = @{ Prerelease = 'preview8'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
1818
}

shell/shell.common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<TargetFramework>net8.0</TargetFramework>
99
<ImplicitUsings>enable</ImplicitUsings>
1010
<LangVersion>12.0</LangVersion>
11-
<Version>1.0.0-preview.7</Version>
11+
<Version>1.0.0-preview.8</Version>
1212

1313
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)