Skip to content

Commit 5542398

Browse files
alfonsogarciacaroalfonsogarciacaro
committed
Release version 4.0.0-alpha-024
1 parent 3f01c3e commit 5542398

File tree

5 files changed

+15
-74
lines changed

5 files changed

+15
-74
lines changed

‎.paket/Paket.Restore.targets

+8-71
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
This value should match the version in the props generated by paket
160160
If they differ, this means we need to do a restore in order to ensure correct dependencies
161161
-->
162-
<PropertyGroup Condition="'$(PaketPropsVersion)' != '6.0.0' ">
162+
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
163163
<PaketRestoreRequired>true</PaketRestoreRequired>
164164
</PropertyGroup>
165165

@@ -236,16 +236,13 @@
236236
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
237237
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
238238
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
239-
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
240-
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
241-
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
239+
<CopyLocal Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
242240
</PaketReferencesFileLinesInfo>
243241
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
244242
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
245243
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
246-
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
247-
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
248-
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
244+
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
245+
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
249246
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
250247
<AllowExplicitVersion>true</AllowExplicitVersion>
251248
</PackageReference>
@@ -292,16 +289,14 @@
292289
<PropertyGroup>
293290
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
294291
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
295-
<UseMSBuild16_10_Pack>false</UseMSBuild16_10_Pack>
296-
<UseMSBuild16_10_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND '@(MSBuildMinorVersion)' > '10' ">true</UseMSBuild16_10_Pack>
297292
<UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
298-
<UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild16_0_Pack>
293+
<UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
299294
<UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
300295
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
301296
<UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
302-
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild15_8_Pack>
297+
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
303298
<UseNuGet4_Pack>false</UseNuGet4_Pack>
304-
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseNuGet4_Pack>
299+
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
305300
<AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath>
306301
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath>
307302
</PropertyGroup>
@@ -319,55 +314,6 @@
319314
</ConvertToAbsolutePath>
320315

321316
<!-- Call Pack -->
322-
<PackTask Condition="$(UseMSBuild16_10_Pack)"
323-
PackItem="$(PackProjectInputFile)"
324-
PackageFiles="@(_PackageFiles)"
325-
PackageFilesToExclude="@(_PackageFilesToExclude)"
326-
PackageVersion="$(PackageVersion)"
327-
PackageId="$(PackageId)"
328-
Title="$(Title)"
329-
Authors="$(Authors)"
330-
Description="$(Description)"
331-
Copyright="$(Copyright)"
332-
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
333-
LicenseUrl="$(PackageLicenseUrl)"
334-
ProjectUrl="$(PackageProjectUrl)"
335-
IconUrl="$(PackageIconUrl)"
336-
ReleaseNotes="$(PackageReleaseNotes)"
337-
Tags="$(PackageTags)"
338-
DevelopmentDependency="$(DevelopmentDependency)"
339-
BuildOutputInPackage="@(_BuildOutputInPackage)"
340-
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
341-
SymbolPackageFormat="$(SymbolPackageFormat)"
342-
TargetFrameworks="@(_TargetFrameworks)"
343-
AssemblyName="$(AssemblyName)"
344-
PackageOutputPath="$(PackageOutputAbsolutePath)"
345-
IncludeSymbols="$(IncludeSymbols)"
346-
IncludeSource="$(IncludeSource)"
347-
PackageTypes="$(PackageType)"
348-
IsTool="$(IsTool)"
349-
RepositoryUrl="$(RepositoryUrl)"
350-
RepositoryType="$(RepositoryType)"
351-
SourceFiles="@(_SourceFiles->Distinct())"
352-
NoPackageAnalysis="$(NoPackageAnalysis)"
353-
MinClientVersion="$(MinClientVersion)"
354-
Serviceable="$(Serviceable)"
355-
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
356-
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
357-
NuspecOutputPath="$(AdjustedNuspecOutputPath)"
358-
IncludeBuildOutput="$(IncludeBuildOutput)"
359-
BuildOutputFolders="$(BuildOutputTargetFolder)"
360-
ContentTargetFolders="$(ContentTargetFolders)"
361-
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
362-
NuspecFile="$(NuspecFileAbsolutePath)"
363-
NuspecBasePath="$(NuspecBasePath)"
364-
NuspecProperties="$(NuspecProperties)"
365-
PackageLicenseFile="$(PackageLicenseFile)"
366-
PackageLicenseExpression="$(PackageLicenseExpression)"
367-
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
368-
Readme="$(PackageReadmeFile)"
369-
NoDefaultExcludes="$(NoDefaultExcludes)"/>
370-
371317
<PackTask Condition="$(UseMSBuild16_0_Pack)"
372318
PackItem="$(PackProjectInputFile)"
373319
PackageFiles="@(_PackageFiles)"
@@ -397,8 +343,6 @@
397343
IsTool="$(IsTool)"
398344
RepositoryUrl="$(RepositoryUrl)"
399345
RepositoryType="$(RepositoryType)"
400-
RepositoryBranch="$(RepositoryBranch)"
401-
RepositoryCommit="$(RepositoryCommit)"
402346
SourceFiles="@(_SourceFiles->Distinct())"
403347
NoPackageAnalysis="$(NoPackageAnalysis)"
404348
MinClientVersion="$(MinClientVersion)"
@@ -415,8 +359,7 @@
415359
NuspecProperties="$(NuspecProperties)"
416360
PackageLicenseFile="$(PackageLicenseFile)"
417361
PackageLicenseExpression="$(PackageLicenseExpression)"
418-
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
419-
NoDefaultExcludes="$(NoDefaultExcludes)" />
362+
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" />
420363

421364
<PackTask Condition="$(UseMSBuild15_9_Pack)"
422365
PackItem="$(PackProjectInputFile)"
@@ -447,8 +390,6 @@
447390
IsTool="$(IsTool)"
448391
RepositoryUrl="$(RepositoryUrl)"
449392
RepositoryType="$(RepositoryType)"
450-
RepositoryBranch="$(RepositoryBranch)"
451-
RepositoryCommit="$(RepositoryCommit)"
452393
SourceFiles="@(_SourceFiles->Distinct())"
453394
NoPackageAnalysis="$(NoPackageAnalysis)"
454395
MinClientVersion="$(MinClientVersion)"
@@ -492,8 +433,6 @@
492433
IsTool="$(IsTool)"
493434
RepositoryUrl="$(RepositoryUrl)"
494435
RepositoryType="$(RepositoryType)"
495-
RepositoryBranch="$(RepositoryBranch)"
496-
RepositoryCommit="$(RepositoryCommit)"
497436
SourceFiles="@(_SourceFiles->Distinct())"
498437
NoPackageAnalysis="$(NoPackageAnalysis)"
499438
MinClientVersion="$(MinClientVersion)"
@@ -536,8 +475,6 @@
536475
IsTool="$(IsTool)"
537476
RepositoryUrl="$(RepositoryUrl)"
538477
RepositoryType="$(RepositoryType)"
539-
RepositoryBranch="$(RepositoryBranch)"
540-
RepositoryCommit="$(RepositoryCommit)"
541478
SourceFiles="@(_SourceFiles->Distinct())"
542479
NoPackageAnalysis="$(NoPackageAnalysis)"
543480
MinClientVersion="$(MinClientVersion)"

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
## 4.0.0-alpha-024
10+
11+
* Fable 4 alpha-24
12+
913
## 4.0.0-alpha-022
1014

1115
* Fable 4 alpha-22

‎build.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ let buildLib = BuildTask.create "BuildLib" [ copyModules ] {
174174
)
175175
}
176176

177-
let buildApp = BuildTask.create "BuildApp" [ updatePreludeREPLVersion.IfNeeded ] {
177+
let buildApp = BuildTask.create "BuildApp" [ copyModules ] {
178178
Npm.run "build" id
179179
}
180180

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App/Prelude.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open Fable.Core
66

77
[<RequireQualifiedAccess>]
88
module Literals =
9-
let [<Literal>] REPL_VERSION = "4.0.0-alpha-022" // Do not edit manually
9+
let [<Literal>] REPL_VERSION = "4.0.0-alpha-024" // Do not edit manually
1010
let [<Literal>] STORAGE_KEY = "fable-repl"
1111
let [<Literal>] MAX_LOGS_LENGTH = 200
1212
// let [<Literal>] HOST =

0 commit comments

Comments
 (0)