Skip to content

Commit aa62d5f

Browse files
dingmeng-xuekceiw
andauthored
Update dependencies of Az.Tools.Predictor (Azure#18013)
* Fix module's dependency (Azure#17824) * Update the external dependenct modules * update the packages to GA version * Exclude contentFiles in the out directory * Remove Az as the external dependent module * Format the csproj file. * update files Co-authored-by: kceiw <[email protected]>
1 parent b2be3c7 commit aa62d5f

8 files changed

+18
-13
lines changed

tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.csproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<AssemblyName>Microsoft.Azure.PowerShell.Tools.AzPredictor</AssemblyName>
55
<RootNamespace>Microsoft.Azure.PowerShell.Tools.AzPredictor</RootNamespace>
66
<RepoArtifacts>$(MSBuildThisFileDirectory)</RepoArtifacts>
77
<OutputPath>$(RepoArtifacts)..\..\..\artifacts\Tools\Az.Tools.Predictor\</OutputPath>
8+
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
9+
<ProduceReferenceAssemblyInOutDir>false</ProduceReferenceAssemblyInOutDir>
810
</PropertyGroup>
911

1012
<PropertyGroup>
@@ -19,10 +21,14 @@ For more information on Az Predictor, please visit the following: https://aka.ms
1921
</PropertyGroup>
2022

2123
<ItemGroup>
22-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
24+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
2325
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.45-preview" />
24-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.6" />
25-
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
26+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0">
27+
<ExcludeAssets>contentFiles</ExcludeAssets>
28+
</PackageReference>
29+
<PackageReference Include="System.Management.Automation" Version="7.2.0">
30+
<ExcludeAssets>contentFiles</ExcludeAssets>
31+
</PackageReference>
2632
</ItemGroup>
2733

2834
<ItemGroup>

tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.psd1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RootModule = 'Az.Tools.Predictor.psm1'
1212

1313
# Version number of this module.
14-
ModuleVersion = '1.0.0'
14+
ModuleVersion = '1.0.1'
1515

1616
# Supported PSEditions
1717
CompatiblePSEditions = 'Core'
@@ -67,9 +67,7 @@ PrivateData = @{
6767
# IconUri = ''
6868

6969
# ReleaseNotes of this module
70-
ReleaseNotes = '* Updated dependency on PSReadline 2.2.2
71-
* Updated dependency on PowerShell 7.2
72-
* Added validation of pre-requisites before loading module'
70+
ReleaseNotes = '* Updated dependencies'
7371

7472
# Prerelease string of this module
7573
# Prerelease = ''

tools/Az.Tools.Predictor/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<Version>1.0.0</Version>
7+
<Version>1.0.1</Version>
88
<Authors>Microsoft Corporation</Authors>
99
<Company>Microsoft Corporation</Company>
1010
<Copyright>Microsoft Corporation. All rights reserved.</Copyright>
Binary file not shown.

tools/Az.Tools.Predictor/MockPSConsole/MockPSConsole.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.6" />
12-
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
11+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0" />
12+
<PackageReference Include="System.Management.Automation" Version="7.2.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
@@ -20,6 +20,7 @@
2020

2121
<ItemGroup>
2222
<None Include="Microsoft.PowerShell.PSReadLine.Polyfiller.dll" CopyToOutputDirectory="PreserveNewest" />
23+
<None Include="Microsoft.PowerShell.PSReadLine2.dll" CopyToOutputDirectory="PreserveNewest" />
2324
</ItemGroup>
2425

2526
</Project>

tools/Az.Tools.Predictor/NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />

tools/Az.Tools.Predictor/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848

4949
<Target Name="Package" Condition="'$(Configuration)' == 'Release'">
5050
<Message Text="Package $(ModuleName)" />
51-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;&amp;'$(RepoTools)/PublishToolsModule.ps1' -RepositoryLocation '$(ArtifactFolder)' -PublishLocation '$(ArtifactFolder)' -ModuleName $(ModuleName)&quot;" />
51+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;&amp;'$(RepoTools)/PublishToolsModule.ps1' -RepositoryLocation '$(ArtifactFolder)' -PublishLocation '$(ArtifactFolder)' -ModuleName $(ModuleName) -ErrorAction Stop &quot;" />
5252
</Target>
5353
</Project>

0 commit comments

Comments
 (0)