Skip to content

Commit

Permalink
make langversion consistent (#4528)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp authored Jan 22, 2024
1 parent 02144bd commit 574c98e
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 27 deletions.
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<!-- This is strong naming, not signing-->
<SignAssembly>true</SignAssembly>
<!-- The MSAL.snk has both private and public keys -->
Expand Down
1 change: 0 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<IsPackable>true</IsPackable>

<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFrameworkNetStandard>netstandard2.0</TargetFrameworkNetStandard>
<TargetFrameworkNetDesktop Condition="$([MSBuild]::IsOsPlatform('Windows'))">net462</TargetFrameworkNetDesktop>

<LangVersion>8.0</LangVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<TargetFramework Condition="'$(TargetFrameworkNetDesktop)' == ''">$(TargetFrameworkNetStandard)</TargetFramework>
<TargetFrameworks Condition="'$(TargetFrameworkNetDesktop)' != ''">$(TargetFrameworkNetStandard);$(TargetFrameworkNetDesktop)</TargetFrameworks>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<IsPackable>false</IsPackable>
<DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
<Configurations>Debug;Release;Debug + MobileApps</Configurations>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<IsPackable>false</IsPackable>
<DefineConstants>$(DefineConstants);DESKTOP;NET_FX</DefineConstants>
<Configurations>Debug;Release;Debug + MobileApps</Configurations>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<!-- https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/code-generation#debugtype -->
<!--<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>-->
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<TargetFrameworks>$(TargetFrameworkNetDesktop48);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win)</TargetFrameworks>
<IsPackable>false</IsPackable>

<LangVersion>latest</LangVersion>

<Configurations>Debug;Release;Debug + MobileApps</Configurations>

<Platforms>AnyCPU;x64</Platforms>
Expand Down
3 changes: 1 addition & 2 deletions tests/devapps/DesktopTestApp/DesktopTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down Expand Up @@ -139,4 +138,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
3 changes: 1 addition & 2 deletions tests/devapps/FociTestApp/FociTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down Expand Up @@ -67,4 +66,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<LangVersion>8.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions tests/devapps/Intune-xamarin-ios/IntuneMAMSampleiOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug + MobileApps|iPhone'">
Expand All @@ -81,7 +80,6 @@
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -182,4 +180,4 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Microsoft.Intune.MAM.Xamarin.iOS.15.3.0\build\xamarinios10\Microsoft.Intune.MAM.Xamarin.iOS.targets" Condition="Exists('..\packages\Microsoft.Intune.MAM.Xamarin.iOS.15.3.0\build\xamarinios10\Microsoft.Intune.MAM.Xamarin.iOS.targets')" />
</Project>
</Project>
3 changes: 1 addition & 2 deletions tests/devapps/MultiCloudTestApp/MultiCloudTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down Expand Up @@ -67,4 +66,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
1 change: 0 additions & 1 deletion tests/devapps/NetFxConsoleTestApp/NetFxConsoleApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.17763.0</TargetFrameworks>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<LangVersion>8</LangVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<UseWinForms>true</UseWinForms>
<Configurations>Debug;Release;Debug + MobileApps</Configurations>
Expand Down
3 changes: 1 addition & 2 deletions tests/devapps/WAM/NetDesktopWpf/NetDesktopWpfWAM.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down Expand Up @@ -121,4 +120,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down Expand Up @@ -103,4 +102,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 0 additions & 4 deletions tests/devapps/WAM/UWPWam/UWP standalone WAM.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand All @@ -184,7 +183,6 @@
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand All @@ -197,7 +195,6 @@
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand All @@ -210,7 +207,6 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
Expand Down

0 comments on commit 574c98e

Please sign in to comment.