Skip to content
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

Net6 runtime reference assemblies clean #10

Merged
merged 2 commits into from
Oct 11, 2021
Merged

Net6 runtime reference assemblies clean #10

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
c3863fa
delete legacy fake files.
yazeedobaid Oct 8, 2021
32df9f8
new changes.
yazeedobaid Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"paket": {
"version": "6.0.0-rc006",
"version": "6.0.13",
"commands": [
"paket"
]
Expand Down
19 changes: 9 additions & 10 deletions .paket/Paket.Restore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,16 @@
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
<CopyLocal Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
<OmitContent Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '7'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
<ImportTargets Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '8'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
<AllowExplicitVersion>true</AllowExplicitVersion>
</PackageReference>
Expand Down Expand Up @@ -366,9 +365,9 @@
PackageLicenseFile="$(PackageLicenseFile)"
PackageLicenseExpression="$(PackageLicenseExpression)"
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
PackageReadmeFile="$(PackageReadmeFile)"
NoDefaultExcludes="$(NoDefaultExcludes) "/>
Readme="$(PackageReadmeFile)"
NoDefaultExcludes="$(NoDefaultExcludes)"/>

<PackTask Condition="$(UseMSBuild16_0_Pack)"
PackItem="$(PackProjectInputFile)"
PackageFiles="@(_PackageFiles)"
Expand Down
19 changes: 2 additions & 17 deletions legacy-build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ let mutable secrets = []
let releaseSecret replacement name =
let secret =
lazy
let env =
let env =
match getVarOrDefault name "default_unset" with
| "default_unset" -> failwithf "variable '%s' is not set" name
| s -> s
Expand Down Expand Up @@ -219,22 +219,7 @@ Target.create "Legacy_RenameFSharpCompilerService" (fun _ ->
let common = [] // will be added in parent script

let legacyAssemblyInfos =
[ legacyDir </> "FAKE/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make Command line tool"
AssemblyInfo.Guid "fb2b540f-d97a-4660-972f-5eeff8120fba"] @ common
legacyDir </> "FakeLib/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make Lib"
AssemblyInfo.InternalsVisibleTo "Test.FAKECore"
AssemblyInfo.Guid "d6dd5aec-636d-4354-88d6-d66e094dadb5"] @ common
legacyDir </> "Fake.SQL/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make SQL Lib"
AssemblyInfo.Guid "A161EAAF-EFDA-4EF2-BD5A-4AD97439F1BE"] @ common
legacyDir </> "Fake.Experimental/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make Experimental Lib"
AssemblyInfo.Guid "5AA28AED-B9D8-4158-A594-32FE5ABC5713"] @ common
legacyDir </> "Fake.FluentMigrator/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make FluentMigrator Lib"
AssemblyInfo.Guid "E18BDD6F-1AF8-42BB-AEB6-31CD1AC7E56D"] @ common ]
[ ]

let publish f =
if not (File.Exists f) && not (Directory.Exists f) then
Expand Down
82 changes: 3 additions & 79 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,82 +3,6 @@ content: none
//source C:\Users\matth\.nuget\localsource
source https://api.nuget.org/v3/index.json

nuget FSharp.Core redirects: force
nuget Knockout
nuget NuGet.CommandLine
nuget Paket.Core
nuget FSharp.Compiler.Tools
nuget RavenDB.Server
nuget serilog.sinks.nlog
nuget Argu ~> 5.5.0 // support net461
nuget FsCheck
nuget FsCheck.Xunit
nuget Unquote
nuget NUnit
nuget NUnit.Console
nuget Nancy.Authentication.Stateless
nuget Nancy.Hosting.Self
nuget Nancy.Serialization.JsonNet
nuget Nancy.Authentication.Forms
nuget Nancy.Hosting.Aspnet
nuget Nancy.Viewengines.Razor
nuget SSH.NET
// Because of net45 support
nuget Microsoft.Web.Administration
nuget Mono.Web.Xdt
nuget Mono.Cecil prerelease
nuget NuGet.Core
nuget NuGet.Protocol < 5.7
nuget NuGet.Packaging < 5.7
nuget NuGet.Common < 5.7
nuget NuGet.Configuration < 5.7
nuget NuGet.Frameworks < 5.7
nuget NuGet.Versioning < 5.7
nuget FParsec
nuget bootstrap
nuget Knockout.Mapping
nuget log4net
nuget System.Web.Razor.Unofficial
nuget toastr
nuget RavenDB.Client < 4.1
nuget Machine.Specifications.Should
nuget Machine.Specifications
nuget Machine.Specifications.Runner.Console
nuget Nancy.Testing
nuget xunit.runner.console
nuget xunit
nuget Newtonsoft.Json redirects:force
nuget Microsoft.AspNet.Razor 2.0.30506
nuget Microsoft.AspNet.WebPages 2.0.30506
nuget FluentMigrator
nuget FluentMigrator.Abstractions
nuget FluentMigrator.Extensions.SqlAnywhere
nuget FluentMigrator.Extensions.SqlServer
nuget FluentMigrator.Runner
nuget FluentMigrator.Runner.Core
nuget FluentMigrator.Runner.Db2
nuget FluentMigrator.Runner.Firebird
nuget FluentMigrator.Runner.Hana
nuget FluentMigrator.Runner.Jet
nuget FluentMigrator.Runner.MySql
nuget FluentMigrator.Runner.Oracle
nuget FluentMigrator.Runner.Postgres
nuget FluentMigrator.Runner.Redshift
nuget FluentMigrator.Runner.SqlAnywhere
nuget FluentMigrator.Runner.SQLite
nuget FluentMigrator.Runner.SqlServer
nuget FluentMigrator.Runner.SqlServerCe
nuget HashLib
nuget FSharp.Compiler.Service < 37 content: none
nuget Octokit
nuget System.Net.Http
nuget Microsoft.DotNet.PlatformAbstractions
nuget FSharp.Control.Reactive
nuget System.Reactive.Compatibility
// From FSharp.Compiler.Service, but manually managed because of rename, use 4.4.0 because of some msbuild weirdness in legacy...
// no matter what we specify here it seems to always copy 4.4.0 into the output directory. Probably some clash with some implicit dependency somewhere
nuget System.ValueTuple copy_local: true, redirects:force 4.4.0

group DocsLegacyV4
source https://api.nuget.org/v3/index.json
nuget FAKE ~> 4.0
Expand Down Expand Up @@ -149,7 +73,7 @@ group netcorerunner
//source C:\Users\matth\.nuget\localsource
storage: none
framework: net472, netstandard2.0, netcoreapp2.1, net6.0
nuget FSharp.Core = 5.0.0 redirects: force
nuget FSharp.Core = 6.0.0 redirects: force

nuget Paket.Core
nuget Mono.Cecil
Expand Down Expand Up @@ -178,7 +102,7 @@ group netcore
nuget DotNet.Xdt
nuget FSharp.Compiler.Service >= 37.0 content: none

nuget FSharp.Core = 5.0.0 redirects: force
nuget FSharp.Core = 6.0.0 redirects: force
nuget System.Reactive 4.4.1
nuget FParsec
nuget Octokit
Expand All @@ -200,4 +124,4 @@ group netcore
nuget System.Runtime.Loader
nuget System.Collections.Immutable
nuget System.Data.SqlClient
nuget Microsoft.SqlServer.SqlManagementObjects
nuget Microsoft.SqlServer.SqlManagementObjects
Loading