Skip to content

Commit 164e792

Browse files
stevejgordonstevejgordon
authored
Update problematic versions for VS restore (#6495)
* Update ubuntu version for backport action * Fixes for dev and ci build inconsistencies * Fix reference assemblies
1 parent 6888a2c commit 164e792

File tree

24 files changed

+183
-166
lines changed

24 files changed

+183
-166
lines changed

‎.ci/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETCoreApp,Version=v5.0": {
55
"Microsoft.NETFramework.ReferenceAssemblies": {
66
"type": "Direct",
7-
"requested": "[1.0.0-preview.2, )",
8-
"resolved": "1.0.0-preview.2",
9-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
7+
"requested": "[1.0.3, )",
8+
"resolved": "1.0.3",
9+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
1010
}
1111
}
1212
}

‎.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
backport:
10-
runs-on: ubuntu-18.04
10+
runs-on: ubuntu-22.04
1111
name: Backport
1212
steps:
1313
- name: Backport

‎.github/workflows/integration-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
'7.14.2',
4242
'7.15.2',
4343
'7.16.3',
44-
'7.17.0',
44+
'7.17.7',
4545
'latest-7'
4646
]
4747

‎Directory.Build.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>
3535

3636
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
37+
<DisableImplicitLibraryPacksFolder>true</DisableImplicitLibraryPacksFolder>
3738
<RestoreLockedMode>true</RestoreLockedMode>
3839
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
3940

@@ -43,9 +44,10 @@
4344

4445
<ExposedPublicKey>002400000480000094000000060200000024000052534131000400000100010025d3a22bf3781ba85067374ad832dfcba3c4fa8dd89227e36121ba17b2c33ad6b6ce03e45e562050a031e2ff7fe12cff9060a50acbc6a0eef9ef32dc258d90f874b2e76b581938071ccc4b4d98204d1d6ca7a1988d7a211f9fc98efd808cf85f61675b11007d0eb0461dc86a968d6af8ebba7e6b540303b54f1c1f5325c252be</ExposedPublicKey>
4546
</PropertyGroup>
47+
4648
<ItemGroup>
4749
<!-- Include unconditionally due to difference in how dotnet cli and design time builds generate package.lock.json -->
48-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2"/>
50+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3"/>
4951
</ItemGroup>
5052

5153
</Project>

‎build/scripts/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
},
8787
"Microsoft.NETFramework.ReferenceAssemblies": {
8888
"type": "Direct",
89-
"requested": "[1.0.0-preview.2, )",
90-
"resolved": "1.0.0-preview.2",
91-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
89+
"requested": "[1.0.3, )",
90+
"resolved": "1.0.3",
91+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
9292
},
9393
"Newtonsoft.Json": {
9494
"type": "Direct",

‎build/scripts/scripts.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<Content Include="..\..\.github\workflows\make-release-notes.yml"><Link>make-release-notes.yml</Link></Content>
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="FSharp.Core" Version="5.0.0" />
37+
<PackageReference Update="FSharp.Core" Version="5.0.0" />
3838
<PackageReference Include="Bullseye" Version="3.3.0" />
3939
<PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.2.6" />
4040
<PackageReference Include="Fake.Core.Environment" Version="5.15.0" />

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"version": "5.0.408",
4-
"rollForward": "latestFeature",
4+
"rollForward": "latestPatch",
55
"allowPrerelease": false
66
},
77
"version": "7.17.4",

‎src/ApiGenerator/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"Microsoft.NETFramework.ReferenceAssemblies": {
2525
"type": "Direct",
26-
"requested": "[1.0.0-preview.2, )",
27-
"resolved": "1.0.0-preview.2",
28-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
26+
"requested": "[1.0.3, )",
27+
"resolved": "1.0.3",
28+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
2929
},
3030
"Newtonsoft.Json": {
3131
"type": "Direct",

‎src/DocGenerator/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
},
116116
"Microsoft.NETFramework.ReferenceAssemblies": {
117117
"type": "Direct",
118-
"requested": "[1.0.0-preview.2, )",
119-
"resolved": "1.0.0-preview.2",
120-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
118+
"requested": "[1.0.3, )",
119+
"resolved": "1.0.3",
120+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
121121
},
122122
"Newtonsoft.Json": {
123123
"type": "Direct",

‎src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
},
1111
"Microsoft.NETFramework.ReferenceAssemblies": {
1212
"type": "Direct",
13-
"requested": "[1.0.0-preview.2, )",
14-
"resolved": "1.0.0-preview.2",
15-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
13+
"requested": "[1.0.3, )",
14+
"resolved": "1.0.3",
15+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
1616
"dependencies": {
17-
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
17+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
1818
}
1919
},
2020
"Microsoft.SourceLink.GitHub": {
@@ -39,8 +39,8 @@
3939
},
4040
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
4141
"type": "Transitive",
42-
"resolved": "1.0.0-preview.2",
43-
"contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
42+
"resolved": "1.0.3",
43+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
4444
},
4545
"Microsoft.SourceLink.Common": {
4646
"type": "Transitive",
@@ -100,9 +100,9 @@
100100
},
101101
"Microsoft.NETFramework.ReferenceAssemblies": {
102102
"type": "Direct",
103-
"requested": "[1.0.0-preview.2, )",
104-
"resolved": "1.0.0-preview.2",
105-
"contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
103+
"requested": "[1.0.3, )",
104+
"resolved": "1.0.3",
105+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
106106
},
107107
"Microsoft.SourceLink.GitHub": {
108108
"type": "Direct",

0 commit comments

Comments
 (0)