3.9.6
This commit is contained in:
Mikael Karlsson
@@ -34,6 +34,8 @@
|
||||
|
||||
<Grid Grid.Row='2' VerticalAlignment="Stretch" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@@ -44,27 +46,39 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='0'>
|
||||
<StackPanel Orientation="Horizontal" Grid.Row='0' Margin="0,5,5,0" >
|
||||
<Label Content="Skip Basic Properties" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Skip basic properties like name, description, modified etc." />
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column='1' Grid.Row='0' Name='chkSkipCompareBasicProperties' VerticalAlignment="Center" IsChecked="false" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row='1' Margin="0,5,5,0" >
|
||||
<Label Content="Skip Assignments" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Skip comapring assignments." />
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column='1' Grid.Row='1' Name='chkSkipCompareAssignments' VerticalAlignment="Center" IsChecked="false" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='2'>
|
||||
<Label Content="Save as" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Specifies how the export csv should be saved. One file per ObjectType or one file for all objects." />
|
||||
</StackPanel>
|
||||
<ComboBox Name="cbCompareSave" Margin="0,5,0,0" MinWidth="250" Grid.Row='0' Grid.Column="1" HorizontalAlignment="Left"
|
||||
<ComboBox Name="cbCompareSave" Margin="0,5,0,0" MinWidth="250" Grid.Row='2' Grid.Column="1" HorizontalAlignment="Left"
|
||||
DisplayMemberPath="Name" SelectedValuePath="Value" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='1' >
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='3' >
|
||||
<Label Content="Comparison Type" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Specify how objects should be compared" />
|
||||
</StackPanel>
|
||||
<ComboBox Name="cbCompareType" Margin="0,5,0,0" MinWidth="250" Grid.Row='1' Grid.Column="1" HorizontalAlignment="Left"
|
||||
<ComboBox Name="cbCompareType" Margin="0,5,0,0" MinWidth="250" Grid.Row='3' Grid.Column="1" HorizontalAlignment="Left"
|
||||
DisplayMemberPath="Name" SelectedValuePath="Value" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='2' >
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,5,0" Grid.Row='4' >
|
||||
<Label Content="CSV Delimiter" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Specify the character to use for separating properties in the CSV file" />
|
||||
</StackPanel>
|
||||
<ComboBox Name="cbCompareCSVDelimiter" Margin="0,5,0,0" MinWidth="250" Grid.Row='2' Grid.Column="1" HorizontalAlignment="Left" />
|
||||
<ComboBox Name="cbCompareCSVDelimiter" Margin="0,5,0,0" MinWidth="250" Grid.Row='4' Grid.Column="1" HorizontalAlignment="Left" />
|
||||
|
||||
<Grid Margin="0,0,5,0" Grid.Row='3' >
|
||||
<Grid Margin="0,0,5,0" Grid.Row='5' >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
@@ -74,7 +88,7 @@
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<DataGrid Name="dgObjectsToCompare" Margin="0,5,0,5" Grid.Row='3' Grid.Column='1' CanUserAddRows="False" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="White" />
|
||||
<DataGrid Name="dgObjectsToCompare" Margin="0,5,0,5" Grid.Row='5' Grid.Column='1' CanUserAddRows="False" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="White" />
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -45,10 +47,22 @@
|
||||
</Grid>
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row='2' Margin="0,5,5,0" >
|
||||
<Label Content="Skip Basic Properties" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Skip basic properties like name, description, modified etc." />
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column='1' Grid.Row='2' Name='chkSkipCompareBasicProperties' VerticalAlignment="Center" IsChecked="false" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row='3' Margin="0,5,5,0" >
|
||||
<Label Content="Skip Assignments" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Skip comapring assignments." />
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column='1' Grid.Row='3' Name='chkSkipCompareAssignments' VerticalAlignment="Center" IsChecked="false" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row='4' Margin="0,5,5,0" >
|
||||
<Label Content="Comparison Type" />
|
||||
<Rectangle Style="{DynamicResource InfoIcon}" ToolTip="Specify how objects should be compared" />
|
||||
</StackPanel>
|
||||
<ComboBox Name="cbCompareType" Margin="0,5,0,0" MinWidth="250" Grid.Row='2' Grid.Column="1" HorizontalAlignment="Left"
|
||||
<ComboBox Name="cbCompareType" Margin="0,5,0,0" MinWidth="250" Grid.Row='4' Grid.Column="1" HorizontalAlignment="Left"
|
||||
DisplayMemberPath="Name" SelectedValuePath="Value" />
|
||||
|
||||
<TextBlock Grid.Row='999' TextWrapping="Wrap" Margin="5,20,5,0" Grid.ColumnSpan="2">
|
||||
|
||||
41
Xaml/OldAzureApp.xaml
Normal file
41
Xaml/OldAzureApp.xaml
Normal file
@@ -0,0 +1,41 @@
|
||||
<Grid xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
Name="scrollViewerObj"
|
||||
Margin="5">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
Height="{Binding ElementName=scrollViewerObj, Path=ViewportHeight}"
|
||||
Width="{Binding ElementName=scrollViewerObj, Path=ViewportWidth}"
|
||||
MinWidth="500"
|
||||
MinHeight="300"
|
||||
>
|
||||
<Bold>'Microsoft Intune PowerShell' is being decommissioned!</Bold>
|
||||
<LineBreak/><LineBreak/>
|
||||
The current Entra application Microsoft Intune PowerShell with id 'd1ddf0e4-d672-4dae-b554-9d5bdfd93547' is being decommissioned by Microsoft.
|
||||
<LineBreak /><LineBreak />
|
||||
The app might still work but might be retired at any time.
|
||||
<LineBreak/>
|
||||
Please change Apllication in Settings. Either use 'Microsoft Graph PowerShell' or register a custom app.
|
||||
<LineBreak /><LineBreak />
|
||||
See <Hyperlink Name="addCustomApp" NavigateUri="https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app"> Quickstart: Register an application with the Microsoft identity platform</Hyperlink>.
|
||||
<LineBreak /><LineBreak />
|
||||
<CheckBox Name='chkChangeApp' VerticalAlignment="Center" IsChecked="false" Margin="5,0,0,0" >Change app to 'Microsoft Graph PowerShell'</CheckBox>
|
||||
<LineBreak /><LineBreak />
|
||||
<Bold>Note:</Bold>
|
||||
<LineBreak />
|
||||
This might require additional consent prompt and additional app permissions.
|
||||
</TextBlock>
|
||||
</ScrollViewer>
|
||||
|
||||
<StackPanel Grid.Row='1' Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,0,5">
|
||||
<CheckBox Name='chkSkippMessage' VerticalAlignment="Center" IsChecked="false" Margin="5,0,0,0" >Do not show this message again</CheckBox>
|
||||
<Button Name="btnOK" Content="OK" Width='100' Margin="5,0,0,0" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
@@ -34,9 +34,9 @@
|
||||
<LineBreak /><LineBreak />
|
||||
<Bold>Note:</Bold>
|
||||
<LineBreak />
|
||||
The 'Microsoft Intune PowerShell' Enterprise App in Azure is used by default for API calls.
|
||||
The 'Microsoft Graph PowerShell' Enterprise App in Azure is used by default for API calls.
|
||||
<LineBreak />
|
||||
Go to Settings if you want to use 'Microsoft Graph PowerShell' or a custom App.
|
||||
Go to Settings if you want to use a custom App. For mor info, see <Hyperlink Name="addCustomApp" NavigateUri="https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app"> Quickstart: Register an application with the Microsoft identity platform</Hyperlink>.
|
||||
<LineBreak />
|
||||
This software might use permissions not granted for the existing App.
|
||||
<LineBreak />
|
||||
|
||||
Reference in New Issue
Block a user