Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Merge branch '4.7.0' into ios_appium_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
PureWeen committed Jun 16, 2020
2 parents 9c0f8d3 + a63fe11 commit cbb3a67
Show file tree
Hide file tree
Showing 475 changed files with 15,770 additions and 2,822 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ caketools/
.XamarinFormsVersionFile.txt
.idea
Visual Studio 2019/**
build/packages
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.AppLinks.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms applinks xamarinforms xamarin.forms</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down Expand Up @@ -36,6 +36,8 @@
</references>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
</files>
Expand Down
5 changes: 3 additions & 2 deletions .nuspec/Xamarin.Forms.DualScreen.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms twopaneview DualScreen xamarinforms xamarinformsdualscreen xamarin.forms.dualscreen</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -26,7 +26,8 @@
</dependencies>
</metadata>
<files>

<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<!--netstandard 1.0-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard1.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard1.0" />
Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Maps.GTK.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps gtk gtk-sharp linux</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -21,6 +21,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.GTK\Libs\GMaps\GMap.NET.Core.dll" target="lib\net45" />
<file src="..\Xamarin.Forms.Platform.GTK\Libs\GMaps\GMap.NET.GTK.dll" target="lib\net45" />
<file src="..\Xamarin.Forms.Maps.GTK\bin\$Configuration$\Xamarin.Forms.Maps.GTK.dll" target="lib\net45"/>
Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Maps.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps wpf</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -24,6 +24,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.dll" target="lib\net45" />
<file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.*pdb" target="lib\net45" />
</files>
Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Maps.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down Expand Up @@ -38,6 +38,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Maps.dll" target="lib\netstandard1.0" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard1.0" />

Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Pages.Azure.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<authors>Microsoft</authors>
<owners>microsoft xamarin</owners>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -21,6 +21,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard1.4" />
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard2.0" />
</files>
Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Pages.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<authors>Microsoft</authors>
<owners>microsoft xamarin</owners>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -20,6 +20,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.dll" target="lib\netstandard1.4" />
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.dll" target="lib\netstandard2.0" />
</files>
Expand Down
4 changes: 3 additions & 1 deletion .nuspec/Xamarin.Forms.Platform.GTK.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms xamarinforms xamarin.forms gtk gtk-sharp linux</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -21,6 +21,8 @@
</dependencies>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.GTK\Libs\webkit-sharp\webkit-sharp.dll" target="lib\net45"/>
<file src="..\Xamarin.Forms.Platform.GTK\Libs\webkit-sharp\webkit-sharp.dll.config" target="content"/>
<file src="..\Xamarin.Forms.Platform.GTK\bin\$Configuration$\Xamarin.Forms.Platform.GTK.dll" target="lib\net45"/>
Expand Down
19 changes: 11 additions & 8 deletions .nuspec/Xamarin.Forms.Platform.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,25 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms xamarinforms xamarin.forms wpf</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Xamarin Forms Renderer to build native UIs for WPF</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="net45">
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="OpenTK" version="3.0.1"/>
<dependency id="OpenTK.GLControl" version="3.0.1"/>
</group>
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="OpenTK" version="3.0.1"/>
<dependency id="OpenTK.GLControl" version="3.0.1"/>
</dependencies>
</metadata>
<files>
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.dll" target="lib\net45" />
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.*pdb" target="lib\net45" />
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\net461\Xamarin.Forms.Platform.WPF.dll" target="lib\net461" />
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\net461\Xamarin.Forms.Platform.WPF.*pdb" target="lib\net461" />

<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\netcoreapp3.1\Xamarin.Forms.Platform.WPF.dll" target="lib\netcoreapp3.1" />
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\netcoreapp3.1\Xamarin.Forms.Platform.WPF.*pdb" target="lib\netcoreapp3.1" />
</files>
</package>
5 changes: 3 additions & 2 deletions .nuspec/Xamarin.Forms.Visual.Material.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms visual material xamarinforms xamarinformsvisualmaterial xamarin.forms.visual.material</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down Expand Up @@ -38,7 +38,8 @@
</dependencies>
</metadata>
<files>

<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<!--netstandard-->
<file src="_._" target="lib\netstandard1.0\_._" />

Expand Down
7 changes: 4 additions & 3 deletions .nuspec/Xamarin.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<owners>microsoft xamarin</owners>
<tags>xamarin forms xamarinforms xamarin.forms</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<icon>Assets\xamarin_128x128.png</icon>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down Expand Up @@ -37,7 +37,7 @@
<group targetFramework="uap10.0.16299">
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.0.15" />
<dependency id="Win2D.uwp" version="1.20.0" />
<dependency id="Microsoft.UI.Xaml" version="2.3.191211002" />
<dependency id="Microsoft.UI.Xaml" version="2.4.2" />
</group>
<group targetFramework="tizen40">
<dependency id="Tizen.NET" version="4.0.0"/>
Expand Down Expand Up @@ -100,7 +100,8 @@
</metadata>

<files>

<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<!--netstandard 1.0-->
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.dll" target="lib\netstandard1.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.*pdb" target="lib\netstandard1.0" />
Expand Down
3 changes: 2 additions & 1 deletion .nuspec/Xamarin.Forms.targets
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
Inputs="@(_XamlGInputs)"
Outputs="@(_XamlGOutputs)">
<PropertyGroup>
<ReferencedAssemblies>@(ReferencePath)</ReferencedAssemblies>
<ReferencedAssemblies Condition="'$(_ReferencedAssemblies)'==''">@(ReferencePath)</ReferencedAssemblies>
<ReferencedAssemblies Condition="'$(_ReferencedAssemblies)'!=''">$(_ReferencedAssemblies)</ReferencedAssemblies>
</PropertyGroup>
<XamlGTask
XamlFiles="@(_XamlGInputs)"
Expand Down
1 change: 1 addition & 0 deletions DevopsNuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<add key="nightly" value="https://aka.ms/xf-ci/index.json" />
<add key="nuget" value="../s/Nuget" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<Target Name="GitVersion" />

<Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="Environment.Build.props" />
</Project>
</Project>
14 changes: 7 additions & 7 deletions DualScreen/DualScreen/TwoPanePropertiesGallery.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@ protected override void OnAppearing()
TallModeConfiguration.SelectedIndex = 1;
WideModeConfiguration.SelectedIndex = 1;

//DualScreenInfo.Current.HingeAngleChanged += OnHingeAngleChanged;
DualScreenInfo.Current.HingeAngleChanged += OnHingeAngleChanged;
}

protected override void OnDisappearing()
{
//DualScreenInfo.Current.HingeAngleChanged -= OnHingeAngleChanged;
DualScreenInfo.Current.HingeAngleChanged -= OnHingeAngleChanged;
}

//void OnHingeAngleChanged(object sender, DualScreen.HingeAngleChangedEventArgs e)
//{
// lblHingeAngle.Text = e.HingeAngleInDegrees.ToString();
//}
void OnHingeAngleChanged(object sender, HingeAngleChangedEventArgs e)
{
lblHingeAngle.Text = e.HingeAngleInDegrees.ToString();
}

void Setup(double width, double height)
{
Expand All @@ -72,4 +72,4 @@ void OnReset(object sender, EventArgs e)
Pane2Length.Value = 0.5;
}
}
}
}
5 changes: 3 additions & 2 deletions Environment.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
</PropertyGroup>





<PropertyGroup Condition="'$(CI)' == ''">
<CI>false</CI>
<CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
Expand Down Expand Up @@ -45,4 +46,4 @@
<AndroidRestoreOnBuild Condition="'$(AndroidRestoreOnBuild)' == ''">True</AndroidRestoreOnBuild>
<AcceptAndroidSDKLicenses Condition="'$(AcceptAndroidSDKLicenses)' == ''">True</AcceptAndroidSDKLicenses>
</PropertyGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion GitInfo.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.0
4.7.0
16 changes: 16 additions & 0 deletions Nuget.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
</PackageReference>
<PackageReference Include="Xamarin.Forms.Maps" Version="$(XamarinFormsVersion)">
</PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="$(XamarinFormsVersion)">
</PackageReference>
<PackageReference Include="Xamarin.Forms.DualScreen" Version="$(XamarinFormsVersion)">
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" $(TargetFrameworkIdentifier.StartsWith('MonoAndroid')) ">
<PackageReference Include="Xamarin.Forms.AppLinks" Version="$(XamarinFormsVersion)">
</PackageReference>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions Nuget/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
8 changes: 2 additions & 6 deletions PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,8 @@
<Name>Xamarin.Forms.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\PagesGallery\PagesGallery.csproj">
<Project>{343ebf1b-f26d-4d4d-b7d9-f6e25247af31}</Project>
<Name>PagesGallery</Name>
<Project>{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}</Project>
</ProjectReference>
<ProjectReference Include="..\..\Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj">
<Project>{e1586ce6-8eac-4388-a15a-1aabf108b5f8}</Project>
<Name>Xamarin.Forms.Material.Android</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -286,4 +282,4 @@
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@
<Version>6.0.15</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.3.191211002</Version>
<Version>2.4.2</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ You should now be able to run any of the UWP UI Tests.

## Coding Style ##

We follow the style used by the [.NET Foundation](https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md), with a few exceptions:
We follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md), with a few exceptions:

- We do not use the `private` keyword as it is the default accessibility level in C#.
- We use hard tabs over spaces. You can change this setting in Visual Studio for Windows via `Tools > Options` and navigating to `Text Editor > C#` and selecting the "Keep tabs" radio option. In Visual Studio for Mac it's set via preferences in `Source Code > Code Formatting > C# source code` and disabling the checkbox for `Convert tabs to spaces`.
Expand Down

0 comments on commit cbb3a67

Please sign in to comment.