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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>
<PropertyGroup>
<VersionPrefix>3.0.5</VersionPrefix>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MajorVersion>3</MajorVersion>
<MinorVersion>1</MinorVersion>

<!-- Build release-only package. -->
<PreReleaseVersionLabel/>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
Expand Down
297 changes: 0 additions & 297 deletions src/Resources.Designer.cs

This file was deleted.

31 changes: 12 additions & 19 deletions src/dotnet-format.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
<LangVersion>7.3</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>Microsoft.CodeAnalysis.Tools</RootNamespace>
<ServerGarbageCollection>true</ServerGarbageCollection>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<Description>Command line tool for formatting C# and Visual Basic code files based on .editorconfig settings.</Description>
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
Comment thread
tmat marked this conversation as resolved.

<ServerGarbageCollection>true</ServerGarbageCollection>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<!-- These identifiers are for generating the shim'd core executables for signing. Not all options
from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context. -->
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
Comment thread
tmat marked this conversation as resolved.

<!--
These identifiers are for generating the shim'd core executables for signing. Not all options
from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context.
-->
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -44,18 +48,7 @@
</ItemGroup>

<ItemGroup>
<Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources.resx" GenerateSource="true" />
</ItemGroup>

</Project>