Commit5e31fa0

dotnet-automerge-bot

authored

Merge pull requestdotnet#5870 from Microsoft/merges/master-to-dev16.0

Merge master to dev16.0

2 parentsb6db6d4 +57b2a00 commit5e31fa0Copy full SHA for 5e31fa0

File tree

-18

lines changed

-18

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`<Private>True</Private>`
`48`	`48`	`</Reference>`
`49`	`49`	`<ReferenceInclude="System.ValueTuple">`
`50`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`50`	`+ <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>`
`51`	`51`	`<Private>True</Private>`
`52`	`52`	`</Reference>`
`53`	`53`	`</ItemGroup>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`<Private>True</Private>`
`44`	`44`	`</Reference>`
`45`	`45`	`<ReferenceInclude="System.ValueTuple">`
`46`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`46`	`+ <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>`
`47`	`47`	`<Private>True</Private>`
`48`	`48`	`</Reference>`
`49`	`49`	`</ItemGroup>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`<Private>True</Private>`
`51`	`51`	`</Reference>`
`52`	`52`	`<ReferenceInclude="System.ValueTuple">`
`53`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`53`	`+ <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>`
`54`	`54`	`<Private>True</Private>`
`55`	`55`	`</Reference>`
`56`	`56`	`</ItemGroup>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ type SettingsStore(serviceProvider: IServiceProvider) =`
`48`	`48`	`settingsManager.SetValueAsync(settings.GetType()\|> storageKey, JsonConvert.SerializeObject settings,false)`
`49`	`49`	`\|> Async.AwaitTask\|> Async.StartImmediate`
`50`	`50`
`51`		`-member__.Register defaultSettings=`
	`51`	`+member__.Register(defaultSettings:'options)=`
`52`	`52`	`defaultSettings\|> updateFromStore\|> write`
`53`	`53`	`letsubset= defaultSettings.GetType()\|> storageKey\|> settingsManager.GetSubset`
`54`	`54`
`55`	`55`	`PropertyChangedAsyncEventHandler(fun _ _->`
`56`		`- read()\|> updateFromStore\|> write`
	`56`	`+(read():'options)\|> updateFromStore\|> write`
`57`	`57`	`System.Threading.Tasks.Task.CompletedTask)`
`58`	`58`	`\|> subset.add_SettingChangedAsync`

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ open Microsoft.VisualStudio.ComponentModelHost`
`10`	`10`	`moduleinternalOptionsUIHelpers=`
`11`	`11`
`12`	`12`	`[<AbstractClass>]`
`13`		`-typeAbstractOptionPage<'t>()as this=`
	`13`	`+typeAbstractOptionPage<'options>()as this=`
`14`	`14`	`inherit UIElementDialogPage()`
`15`	`15`
`16`	`16`	`letview=lazy this.CreateView()`
`@@ -26,20 +26,10 @@ module internal OptionsUIHelpers =`
`26`	`26`	`overridethis.Child=upcast view.Value`
`27`	`27`
`28`	`28`	`overridethis.SaveSettingsToStorage()=`
`29`		`-this.GetResult()\|> optionService.Value.Write`
	`29`	`+downcast view.Value.DataContext\|> optionService.Value.Write<'options>`
`30`	`30`
`31`	`31`	`overridethis.LoadSettingsFromStorage()=`
`32`		`- optionService.Value.Read()\|> this.SetViewModel`
`33`		`-`
`34`		`-//Override this method when using immutable settings type`
`35`		`-member__.SetViewModel(settings:'t)=`
`36`		`-// in case settings are a CLIMutable record`
`37`		`- view.Value.DataContext<-null`
`38`		`- view.Value.DataContext<- settings`
`39`		`-`
`40`		`-//Override this method when using immutable settings type`
`41`		`-member__.GetResult():'t=`
`42`		`-downcast view.Value.DataContext`
	`32`	`+ view.Value.DataContext<- optionService.Value.Read<'options>()`
`43`	`33`
`44`	`34`	`//data binding helpers`
`45`	`35`	`letradioButtonCoverter=`

Comments

(0)