Skip to content

bump FCS TFM to net472, and add netstandard references where necessary #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baronfel wants to merge 2 commits into from
Closed

bump FCS TFM to net472, and add netstandard references where necessary #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0af93b
bump TFM to net472, and add netstandard references where necessary
baronfel Aug 8, 2020
7843b7e
release notes
baronfel Aug 8, 2020
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
2 changes: 1 addition & 1 deletion fcs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
<ToolsetFsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</ToolsetFsiToolPath>
<ToolsetFsiToolExe>fsi.exe</ToolsetFsiToolExe>
<FcsFSharpCorePkgVersion>4.6.2</FcsFSharpCorePkgVersion>
<FcsTargetNetFxFramework>net461</FcsTargetNetFxFramework>
<FcsTargetNetFxFramework>net472</FcsTargetNetFxFramework>
</PropertyGroup>
</Project>
2 changes: 2 additions & 0 deletions fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<Reference Include="netstandard" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\netfx.props" />
<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
<TargetFrameworks>$(FcsTargetNetFxFramework);netstandard2.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);0067;1591</NoWarn>
Expand Down
2 changes: 2 additions & 0 deletions fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="UIAutomationTypes" />
<Reference Include="netstandard" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<ProjectReference Include="CSharp_Analysis\CSharp_Analysis.csproj" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<Compile Include="$(FSharpSourcesRoot)/fsharp/ReferenceResolver.fs">
<Link>ReferenceResolution/ReferenceResolver.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
<Compile Include="$(FSharpSourcesRoot)/fsharp/SimulatedMSBuildReferenceResolver.fs">
<Link>ReferenceResolution/SimulatedMSBuildReferenceResolver.fs</Link>
</Compile>
<EmbeddedText Include="$(FSharpSourcesRoot)\utils\UtilsStrings.txt" />
Expand Down Expand Up @@ -739,6 +739,10 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
Expand Down
5 changes: 5 additions & 0 deletions fcs/RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#### 37.0.1

This release is a packaging fix release that updates the .Net Framework TFM requirement from 4.6.1 to 4.7.2, to be
in line with the new dependencies on Microsoft.Build.Framework, Microsoft.Build.Tasks.Core and Microsoft.Build.Utilities.Core

#### 37.0.0

This release bring a number of new changes, including a massive enhancement to SemanticClassification types thanks to @cartermp.
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/compiler.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラの組み込み
====================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/corelib.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/net461"
#I "../../../../artifacts/bin/fcs/net472"
(**
コンパイラサービス: FSharp.Core.dll についてのメモ
==================================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/editor.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ language: ja
*)

(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス: エディタサービス
====================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/filesystem.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス: ファイルシステム仮想化
==========================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/interactive.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
インタラクティブサービス: F# Interactiveの組み込み
==================================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/project.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス: プロジェクトの分析
======================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/symbols.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス: シンボルの処理
==================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/tokenizer.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス：F#トークナイザを使用する
============================================
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/untypedtree.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: ja
---
*)
(*** hide ***)
#I "../../../../artifacts/bin/fcs/Release/net461"
#I "../../../../artifacts/bin/fcs/Release/net472"
(**
コンパイラサービス：型無し構文木の処理
======================================
Expand Down
4 changes: 2 additions & 2 deletions tests/service/AssemblyContentProviderTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/AssemblyReaderShim.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/CSharpProjectAnalysis.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../bin/v4.5/CSharp_Analysis.dll"
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/EditorTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
// Use F# Interactive. This only works for FSHarp.Compiler.Service.dll which has a public API

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/ExprTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/FileSystemTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/FscTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/FsiTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/InteractiveCheckerTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/MultiProjectAnalysisTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/PerfTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/ProjectAnalysisTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/ScriptOptionsTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/ServiceUntypedParseTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/StructureTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down
4 changes: 2 additions & 2 deletions tests/service/TokenizerTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#if INTERACTIVE
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
#r "../../artifacts/bin/fcs/net472/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
#r "../../artifacts/bin/fcs/net472/nunit.framework.dll"
#load "FsUnit.fs"
#load "Common.fs"
#else
Expand Down