Skip to content

Commit

Permalink
Update dependencies of Az.Tools.Predictor (Azure#18013)
Browse files Browse the repository at this point in the history
* 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 <mahuang@microsoft.com>
  • Loading branch information
dingmeng-xue and kceiw authored Apr 29, 2022
1 parent b2be3c7 commit aa62d5f
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Microsoft.Azure.PowerShell.Tools.AzPredictor</AssemblyName>
<RootNamespace>Microsoft.Azure.PowerShell.Tools.AzPredictor</RootNamespace>
<RepoArtifacts>$(MSBuildThisFileDirectory)</RepoArtifacts>
<OutputPath>$(RepoArtifacts)..\..\..\artifacts\Tools\Az.Tools.Predictor\</OutputPath>
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
<ProduceReferenceAssemblyInOutDir>false</ProduceReferenceAssemblyInOutDir>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.45-preview" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.6" />
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0">
<ExcludeAssets>contentFiles</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Management.Automation" Version="7.2.0">
<ExcludeAssets>contentFiles</ExcludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
RootModule = 'Az.Tools.Predictor.psm1'

# Version number of this module.
ModuleVersion = '1.0.0'
ModuleVersion = '1.0.1'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -67,9 +67,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Updated dependency on PSReadline 2.2.2
* Updated dependency on PowerShell 7.2
* Added validation of pre-requisites before loading module'
ReleaseNotes = '* Updated dependencies'

# Prerelease string of this module
# Prerelease = ''
Expand Down
2 changes: 1 addition & 1 deletion tools/Az.Tools.Predictor/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
<Authors>Microsoft Corporation</Authors>
<Company>Microsoft Corporation</Company>
<Copyright>Microsoft Corporation. All rights reserved.</Copyright>
Expand Down
Binary file not shown.
Binary file not shown.
5 changes: 3 additions & 2 deletions tools/Az.Tools.Predictor/MockPSConsole/MockPSConsole.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.6" />
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0" />
<PackageReference Include="System.Management.Automation" Version="7.2.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -20,6 +20,7 @@

<ItemGroup>
<None Include="Microsoft.PowerShell.PSReadLine.Polyfiller.dll" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.PowerShell.PSReadLine2.dll" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion tools/Az.Tools.Predictor/NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
Expand Down
2 changes: 1 addition & 1 deletion tools/Az.Tools.Predictor/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@

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

0 comments on commit aa62d5f

Please sign in to comment.