Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions src/Kusto/Az.Kusto.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PsModuleName>Kusto</PsModuleName>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
</Project>
</Project>
218 changes: 118 additions & 100 deletions src/Kusto/Az.Kusto.format.ps1xml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/Kusto/Az.Kusto.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 5/7/2020
# Generated on: 8/12/2020
#

@{
Expand All @@ -18,7 +18,7 @@ ModuleVersion = '0.1.4'
CompatiblePSEditions = 'Core', 'Desktop'

# ID used to uniquely identify this module
GUID = 'af390c08-e984-4145-81c9-effe6fb4c9f6'
GUID = '18c61846-f6f0-425e-ba4b-5cf903e2bdd8'

# Author of this module
Author = 'Microsoft Corporation'
Expand All @@ -45,13 +45,13 @@ PowerShellVersion = '5.1'
DotNetFrameworkVersion = '4.7.2'

# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
# CLRVersion = ''
# ClrVersion = ''

# Processor architecture (None, X86, Amd64) required by this module
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.9.2'; })
# RequiredModules = @()

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = './bin/Az.Kusto.private.dll'
Expand Down Expand Up @@ -135,7 +135,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Supported new cmdlets'
# ReleaseNotes = ''

# Prerelease string of this module
# Prerelease = ''
Expand Down
10 changes: 5 additions & 5 deletions src/Kusto/Az.Kusto.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
}
}
if(-not $accountsModule) {
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
if($hasAdequateVersion) {
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
}
}
}

if(-not $accountsModule) {
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
} elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
} elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
}
Write-Information "Loaded Module '$($accountsModule.Name)'"

Expand Down
5 changes: 3 additions & 2 deletions src/Kusto/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!--
Please leave this section at the top of the change log.

Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
Changes for the upcoming release should go under the section titled "Upcoming Release", and should adhere to the following format:

## Current Release
## Upcoming Release
* Overview of change #1
- Additional information about change #1
* Overview of change #2
Expand All @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Updated API version to 2020-06-14; added new properties to data connection and cluster

## Version 0.1.4
* Supported new cmdlets
Expand Down
94 changes: 23 additions & 71 deletions src/Kusto/Kusto.sln
Original file line number Diff line number Diff line change
@@ -1,96 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{62843FE6-7575-4D88-B989-7DF7EEC0BC01}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{3E016018-D65D-4336-9F64-17DA97783AD0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{442C609B-A431-4A71-B289-08F0B63C83E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Az.Kusto", "Az.Kusto.csproj", "{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Az.Kusto", "Az.Kusto.csproj", "{1C203C0C-E0FD-40D2-B79E-C6DA52E4E350}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|ARM.Build.0 = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|x64.ActiveCfg = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|x64.Build.0 = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|x86.ActiveCfg = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|x86.Build.0 = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|ARM.ActiveCfg = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|ARM.Build.0 = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x64.ActiveCfg = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x64.Build.0 = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x86.ActiveCfg = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|ARM.Build.0 = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|x64.Build.0 = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|x86.Build.0 = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|Any CPU.Build.0 = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|ARM.ActiveCfg = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|ARM.Build.0 = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|x64.ActiveCfg = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|x64.Build.0 = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|x86.ActiveCfg = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|x86.Build.0 = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|ARM.Build.0 = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|x64.ActiveCfg = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|x64.Build.0 = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|x86.Build.0 = Debug|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|Any CPU.Build.0 = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|ARM.ActiveCfg = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|ARM.Build.0 = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|x64.ActiveCfg = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|x64.Build.0 = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|x86.ActiveCfg = Release|Any CPU
{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|x86.Build.0 = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|ARM.Build.0 = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|x64.ActiveCfg = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|x64.Build.0 = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|x86.ActiveCfg = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Debug|x86.Build.0 = Debug|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|Any CPU.Build.0 = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|ARM.ActiveCfg = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|ARM.Build.0 = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|x64.ActiveCfg = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|x64.Build.0 = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|x86.ActiveCfg = Release|Any CPU
{8C00D3B8-1385-4EE9-AB1C-08EBB796CF73}.Release|x86.Build.0 = Release|Any CPU
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.Build.0 = Release|Any CPU
{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.Build.0 = Release|Any CPU
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.Build.0 = Release|Any CPU
{1C203C0C-E0FD-40D2-B79E-C6DA52E4E350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C203C0C-E0FD-40D2-B79E-C6DA52E4E350}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C203C0C-E0FD-40D2-B79E-C6DA52E4E350}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C203C0C-E0FD-40D2-B79E-C6DA52E4E350}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9B0BAD10-73A2-4F3C-A080-BA73684E7999}
SolutionGuid = {F9B3D96E-9680-40BE-A917-02EE655D6030}
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions src/Kusto/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@

[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("d2a8f744-8dcb-4a13-ba80-eb181ff365ad")]
[assembly: AssemblyVersion("0.1.4")]
[assembly: AssemblyFileVersion("0.1.4")]
[assembly: Guid("70ba42b8-c483-4bba-a77d-1df1c8c20641")]
[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyFileVersion("0.1.0")]
10 changes: 6 additions & 4 deletions src/Kusto/check-dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ if(-not $Isolated) {
return
}

function DownloadModule ([bool]$predicate, [string]$path, [string]$moduleName, [string]$versionMinimum) {
function DownloadModule ([bool]$predicate, [string]$path, [string]$moduleName, [string]$versionMinimum, [string]$requiredVersion) {
if($predicate) {
$module = Get-Module -ListAvailable -Name $moduleName
if((-not $module) -or ($versionMinimum -and ($module | ForEach-Object { $_.Version } | Where-Object { $_ -ge [System.Version]$versionMinimum } | Measure-Object).Count -eq 0)) {
$null = New-Item -ItemType Directory -Force -Path $path
Write-Host -ForegroundColor Green "Installing local $moduleName module into '$path'..."
if($versionMinimum) {
if ($requiredVersion) {
Find-Module -Name $moduleName -RequiredVersion $requiredVersion -Repository PSGallery | Save-Module -Path $path
}elseif($versionMinimum) {
Find-Module -Name $moduleName -MinimumVersion $versionMinimum -Repository PSGallery | Save-Module -Path $path
} else {
Find-Module -Name $moduleName -Repository PSGallery | Save-Module -Path $path
Expand All @@ -44,8 +46,8 @@ if(Test-Path -Path $localModulesPath) {
$env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
}

DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.7.4'
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -versionMinimum ''
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'

$tools = Join-Path $PSScriptRoot 'tools'
$resourceDir = Join-Path $tools 'Resources'
Expand Down
Loading