Skip to content

Commit a50b7aa

Browse files
NkrbNkrb
authored
Merge pull request #62 from microsoft/Nava_updates
Nava updates
2 parents db00159 + 572d67c commit a50b7aa

File tree

156 files changed

+3088410
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+3088410
-194
lines changed

‎cds/orgsvc/C#/AssignRecordToTeam/AssignRecordToTeam.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.902
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssignRecordToTeam", "AssignRecordToTeam\AssignRecordToTeam.csproj", "{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {7AFBAC47-131A-4AA2-A3F1-AA23A04369FB}
24+
EndGlobalSection
25+
EndGlobal

‎cds/orgsvc/C#/AssignRecordToTeam/AssignRecordToTeam/App.config‎

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
4+
<connectionStrings>
5+
6+
7+
8+
<!--
9+
10+
To run all samples without being prompted for login credentials, un-comment and edit one of the example connection strings below using appropriate values for your environment.
11+
12+
Otherwise, you will be prompted for login information when you run a sample project.
13+
14+
15+
16+
Use the system.diagnostics/switches keys below to control levels of logging.
17+
18+
-->
19+
20+
21+
22+
<!--
23+
24+
** !IMPORTANT! **
25+
26+
27+
28+
Be mindful that the connection information you enter in these will be available to anyone with access to this file.
29+
30+
Do not push changes to this file to a cloned GitHub repository.
31+
32+
33+
-->
34+
35+
<!--Online using Office 365-->
36+
37+
<!--<add name="Connect" connectionString="Url=https://yourorgname.crm.dynamics.com; Username=you@yourorg.onmicrosoft.com; Password=password; authtype=Office365; RequireNewInstance=True"/>-->
38+
39+
40+
</connectionStrings>
41+
42+
<system.diagnostics>
43+
44+
<trace autoflush="true" />
45+
46+
<sources>
47+
48+
<source name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchName="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchType="System.Diagnostics.SourceSwitch">
49+
50+
<listeners>
51+
52+
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />
53+
54+
<add name="fileListener" />
55+
56+
</listeners>
57+
58+
</source>
59+
60+
<source name="Microsoft.Xrm.Tooling.CrmConnectControl" switchName="Microsoft.Xrm.Tooling.CrmConnectControl" switchType="System.Diagnostics.SourceSwitch">
61+
62+
<listeners>
63+
64+
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />
65+
66+
<add name="fileListener" />
67+
68+
</listeners>
69+
70+
</source>
71+
72+
<!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
73+
74+
Uncomment this if you are using the Xrm.Tooling.Connector-->
75+
76+
<!--<source name="Microsoft.IdentityModel.Clients.ActiveDirectory" switchName="Microsoft.IdentityModel.Clients.ActiveDirectory" switchType="System.Diagnostics.SourceSwitch">
77+
78+
<listeners>
79+
80+
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
81+
82+
<remove name="Default"/>
83+
84+
<add name="ADALListener"/>
85+
86+
</listeners>
87+
88+
</source>-->
89+
90+
</sources>
91+
92+
<switches>
93+
94+
<!--
95+
96+
Possible values for switches: Off, Error, Warning, Info, Verbose
97+
98+
All" includes Error, Warning, Info, Verbose, Activity Tracing Trace levels
99+
100+
ActivityTracing: Just Activity Tracing
101+
102+
Verbose: includes Error, Warning, Info, Trace levels
103+
104+
Info: includes Error, Warning, Info levels
105+
106+
Warning: includes Error, Warning levels
107+
108+
Error: includes Error level
109+
110+
-->
111+
112+
<add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error" />
113+
114+
<add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error" />
115+
116+
<add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error" />
117+
118+
</switches>
119+
120+
<sharedListeners>
121+
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" />
122+
123+
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800" />
124+
125+
<!--
126+
127+
fileListener Log written to
128+
129+
\\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-{YYYY}-{MM}-{DD}.log
130+
131+
-->
132+
133+
<!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
134+
135+
Uncomment this if you are using the Xrm.Tooling.Connector-->
136+
137+
<!--<add name="ADALListener"
138+
139+
type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector"
140+
141+
BaseFileName="PowerApps-Sample-Log-ADAL"
142+
143+
Location="LocalUserApplicationDirectory"
144+
145+
MaxFileSize="52428800"/>-->
146+
147+
<!--
148+
149+
ADALListener Log written to
150+
151+
\\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-ADAL-{YYYY}-{MM}-{DD}.log
152+
153+
-->
154+
155+
</sharedListeners>
156+
157+
</system.diagnostics>
158+
159+
160+
161+
<startup>
162+
163+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
164+
165+
</startup>
166+
167+
<runtime>
168+
169+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
170+
171+
<dependentAssembly>
172+
173+
<assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral" />
174+
175+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
176+
177+
</dependentAssembly>
178+
179+
<dependentAssembly>
180+
181+
<assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral" />
182+
183+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
184+
185+
</dependentAssembly>
186+
187+
<dependentAssembly>
188+
189+
<assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
190+
191+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
192+
193+
</dependentAssembly>
194+
195+
<dependentAssembly>
196+
197+
<assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral" />
198+
199+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
200+
201+
</dependentAssembly>
202+
203+
<dependentAssembly>
204+
205+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
206+
207+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
208+
209+
</dependentAssembly>
210+
211+
<dependentAssembly>
212+
213+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
214+
215+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
216+
217+
</dependentAssembly>
218+
219+
</assemblyBinding>
220+
221+
</runtime>
222+
223+
</configuration>

cds/orgsvc/C#/AssignSecurityRoleToTeam/AssignSecurityRoleToTeam/AssociateSecurityRoleToTeam.csproj renamed to cds/orgsvc/C#/AssignRecordToTeam/AssignRecordToTeam/AssignRecordToTeam.csproj

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{95B47589-4D5E-4E9B-93B5-C23E064AEFA5}</ProjectGuid>
7+
<ProjectGuid>{8EAF1C5B-56AF-45C9-A17D-C1343FAE8297}</ProjectGuid>
88
<OutputType>Exe</OutputType>
9-
<RootNamespace>AssociateSecurityRoleToTeam</RootNamespace>
10-
<AssemblyName>AssociateSecurityRoleToTeam</AssemblyName>
9+
<RootNamespace>AssignRecordToTeam</RootNamespace>
10+
<AssemblyName>AssignRecordToTeam</AssemblyName>
1111
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -34,19 +34,19 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.9\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
37+
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.19\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
3838
</Reference>
3939
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
4141
</Reference>
4242
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4343
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.13\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
45+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.21\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.9\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
49+
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.19\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.2.9\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
@@ -55,19 +55,19 @@
5555
<HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.2.9\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.13\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
58+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.21\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.13\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
61+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.21\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.13\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
64+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.21\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.13\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
67+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.0.21\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7171
</Reference>
7272
<Reference Include="PresentationCore" />
7373
<Reference Include="PresentationFramework" />
@@ -98,37 +98,24 @@
9898
<Reference Include="WindowsBase" />
9999
</ItemGroup>
100100
<ItemGroup>
101-
<Compile Include="..\..\..\..\LoginUX\ExampleLoginForm.xaml.cs">
102-
<Link>LoginUX\ExampleLoginForm.xaml.cs</Link>
103-
</Compile>
104-
<Compile Include="..\..\MyOrganizationSdkTypes.cs">
105-
<Link>MyOrganizationSdkTypes.cs</Link>
106-
</Compile>
107-
<Compile Include="..\..\OptionSets.cs">
108-
<Link>OptionSets.cs</Link>
109-
</Compile>
110-
<Compile Include="..\..\SampleHelpers.cs">
111-
<Link>SampleHelpers.cs</Link>
112-
</Compile>
113-
<Compile Include="..\..\SystemUserProvider.cs">
114-
<Link>SystemUserProvider.cs</Link>
115-
</Compile>
101+
<Compile Include="HelperCode\MyOrganizationSdkTypes.cs" />
102+
<Compile Include="HelperCode\OptionSets.cs" />
103+
<Compile Include="HelperCode\SampleHelpers.cs" />
104+
<Compile Include="HelperCode\SystemUserProvider.cs" />
105+
<Compile Include="LoginUX\ExampleLoginForm.xaml.cs" />
116106
<Compile Include="SampleMethods.cs" />
117107
<Compile Include="SampleProgram.cs" />
118108
<Compile Include="Properties\AssemblyInfo.cs" />
119109
</ItemGroup>
120110
<ItemGroup>
121-
<Page Include="..\..\..\..\LoginUX\ExampleLoginForm.xaml">
122-
<Link>LoginUX\ExampleLoginForm.xaml</Link>
111+
<None Include="App.config" />
112+
<None Include="packages.config" />
113+
</ItemGroup>
114+
<ItemGroup>
115+
<Page Include="LoginUX\ExampleLoginForm.xaml">
123116
<Generator>MSBuild:Compile</Generator>
124117
<SubType>Designer</SubType>
125118
</Page>
126119
</ItemGroup>
127-
<ItemGroup>
128-
<None Include="..\..\..\..\App.config">
129-
<Link>App.config</Link>
130-
</None>
131-
<None Include="packages.config" />
132-
</ItemGroup>
133120
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
134121
</Project>

0 commit comments

Comments
 (0)