Skip to content

Commit cb528f6

Browse files
matthidmatthid
committed
Bump version to 1.0.0-alpha002
1 parent b9dadb5 commit cb528f6

File tree

7 files changed

+43
-19
lines changed

7 files changed

+43
-19
lines changed

‎.paket/Paket.Restore.targets

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,24 @@
3838
<NoWarn>$(NoWarn);NU1603</NoWarn>
3939
</PropertyGroup>
4040

41+
<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
42+
<PropertyGroup>
43+
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
44+
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
45+
</PropertyGroup>
46+
47+
<!-- If shasum and awk exist get the hashes -->
48+
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
49+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
50+
</Exec>
51+
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
52+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
53+
</Exec>
54+
4155
<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
42-
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
43-
<PaketRestoreLockFileHash>$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
56+
<!-- if no hash has been done yet fall back to just reading in the files and comparing them -->
57+
<PaketRestoreCachedHash Condition=" '$(PaketRestoreCachedHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
58+
<PaketRestoreLockFileHash Condition=" '$(PaketRestoreLockFileHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
4459
<PaketRestoreRequired>true</PaketRestoreRequired>
4560
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
4661
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
@@ -137,27 +152,28 @@
137152

138153
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
139154
<ItemGroup>
140-
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)/*.nuspec"/>
155+
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
141156
</ItemGroup>
142157

143158
<PropertyGroup>
144159
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
145160
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
146161
<UseNewPack>false</UseNewPack>
147162
<UseNewPack Condition=" '$(NuGetToolVersion)' != '4.0.0' ">true</UseNewPack>
148-
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)/</AdjustedNuspecOutputPath>
163+
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath>
149164
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath>
150165
</PropertyGroup>
151166

152167
<ItemGroup>
153-
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)*.nuspec"/>
168+
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
154169
</ItemGroup>
155170

156171
<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />
157172

158173
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
159174
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
160-
</ConvertToAbsolutePath>
175+
</ConvertToAbsolutePath>
176+
161177

162178
<!-- Call Pack -->
163179
<PackTask Condition="$(UseNewPack)"

‎build.fsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ let deps = Paket.Dependencies.Locate()
5252
let lock = deps.GetLockFile()
5353

5454
Target.Create "Clean" (fun _ ->
55-
!! "src/*/*/bin"
55+
!! "src/**/bin"
5656
|> Shell.CleanDirs
5757

58-
!! "src/*/*/obj/*.nuspec"
59-
|> File.deleteAll
58+
!! "src/**/obj"
59+
|> Shell.CleanDirs
6060

6161
Shell.CleanDirs [releaseNugetDir]
6262
)
@@ -82,7 +82,7 @@ Target.Create "DotnetPackage" (fun _ ->
8282
Environment.setEnvironVar "Authors" (String.separated ";" authors)
8383
Environment.setEnvironVar "Description" projectDescription
8484
Environment.setEnvironVar "PackageReleaseNotes" (release.Notes |> String.toLines)
85-
Environment.setEnvironVar "PackageTags" "build;fake;f#"
85+
Environment.setEnvironVar "PackageTags" "dotnet;starcraft;f#"
8686
//Environment.setEnvironVar "PackageIconUrl" "https://raw.githubusercontent.com/fsharp/FAKE/fee4f05a2ee3c646979bf753f3b1f02d927bfde9/help/content/pics/logo.png"
8787
Environment.setEnvironVar "PackageProjectUrl" gitRepositoryUrl
8888
Environment.setEnvironVar "PackageLicenseUrl" (gitRepositoryUrl + "/blob/ae301a8af0b596b55b4d1f9a60e1197f66af9437/LICENSE.txt")
@@ -164,13 +164,11 @@ Target.Create "FastRelease" (fun _ ->
164164
| s when not (System.String.IsNullOrWhiteSpace s) -> s
165165
| _ -> failwith "please set the github_token environment variable to a github personal access token with repro access."
166166

167-
//let files =
168-
// runtimes @ [ "portable"; "packages" ]
169-
// |> List.map (fun n -> sprintf "nuget/dotnetcore/Fake.netcore/fake-dotnetcore-%s.zip" n)
167+
let files = !! (releaseNugetDir + "/*.nupkg")
170168

171169
GitHub.CreateClientWithToken token
172170
|> GitHub.DraftNewRelease gitOwner gitName release.NugetVersion (release.SemVer.PreRelease <> None) release.Notes
173-
//|> GitHub.UploadFiles files
171+
|> GitHub.UploadFiles files
174172
|> GitHub.PublishDraft
175173
|> Async.RunSynchronously
176174
)

‎paket.dependencies

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 5.120.0
1+
version 5.122.0
22
source https://api.nuget.org/v3/index.json
33
storage:none
44

@@ -7,7 +7,7 @@ nuget Google.Protobuf
77
nuget Google.Protobuf.Tools
88

99
// [ FAKE GROUP ]
10-
group NetcoreBuild
10+
group Build
1111
source https://api.nuget.org/v3/index.json
1212
storage: none
1313

@@ -33,3 +33,6 @@ group NetcoreBuild
3333
nuget Fake.Windows.Chocolatey prerelease
3434
nuget Fake.Tools.Git prerelease
3535
nuget Mono.Cecil prerelease
36+
37+
source https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
38+
nuget RoslynTools.ReferenceAssemblies storage: packages

‎paket.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ NUGET
566566
System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< monotouch) (< xamarintvos) (< xamarinwatchos) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
567567
System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.0) (< netstandard1.3) (< monoandroid) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< monotouch) (< xamarintvos) (< xamarinwatchos) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
568568

569-
GROUP NetcoreBuild
569+
GROUP Build
570570
STORAGE: NONE
571571
NUGET
572572
remote: https://api.nuget.org/v3/index.json
@@ -1596,3 +1596,5 @@ NUGET
15961596
System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
15971597
System.Xml.XmlDocument (>= 4.3) - restriction: || (&& (< monotouch) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net46)
15981598
System.Xml.XPath (>= 4.3) - restriction: || (&& (< monotouch) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net46)
1599+
remote: https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
1600+
RoslynTools.ReferenceAssemblies (0.1.1) - storage: packages

‎src/Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkRootPath>$(MSBuildThisFileDirectory)..\packages\build\RoslynTools.ReferenceAssemblies\tools\framework</TargetFrameworkRootPath>
4+
</PropertyGroup>
5+
</Project>

‎src/s2client-fsharp/s2client-fsharp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<AssemblyName>s2client-dotnet</AssemblyName>
66
<PackageId>s2client-dotnet</PackageId>
77
</PropertyGroup>

‎src/s2client-proto/s2client-proto.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
</PropertyGroup>
66
<Import Project="..\..\.paket\Paket.Restore.targets" />
77
</Project>

0 commit comments

Comments
 (0)